Attachment 349682 Details for Bug 189591 – Patch v1

[patch] Patch v1

bug-189591-20180913104814.patch (text/plain), 2.44 KB, created by David Kilzer (:ddkilzer) on 2018-09-13 10:48:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-09-13 10:48:15 PDT

Size: 2.44 KB

patch

obsolete

>Subversion Revision: 235972
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index b7934b716fd14f8cf73974e24d7d84c9ff680db0..a932c5e76e6fc5f7cb6b42d2f72e533f48c9aad8 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-09-13  David Kilzer  <ddkilzer@apple.com>
>+
>+        Add ASSERT() to FTL::DFG::LowerDFGToB3::compileAtomicsReadModifyWrite() to fix clang static analyzer warnings
>+        <https://webkit.org/b/189591>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * dfg/DFGEdge.h:
>+        (JSC::DFG::Edge::Edge): Drive-by fix to change `0` to `nullptr`.
>+        * ftl/FTLLowerDFGToB3.cpp:
>+        (JSC::FTL::DFG::LowerDFGToB3::compileAtomicsReadModifyWrite):
>+        Add ASSERT() to fix clang static analyzer warnings about use of
>+        uninitialized values if `numExtraArgs == 0`. The assert tells
>+        the static analyzer that `numExtraArgs` will be non-zero below
>+        that line of code.
>+
> 2018-09-12  David Kilzer  <ddkilzer@apple.com>
> 
>         Move JavaScriptCore files to match Xcode project hierarchy
>diff --git a/Source/JavaScriptCore/dfg/DFGEdge.h b/Source/JavaScriptCore/dfg/DFGEdge.h
>index 31aa2d5df4eda03ab76467e41c4d6d02d5d7a624..2ea91091eeb5bb0db59e07dcae9c1b13dadd7c90 100644
>--- a/Source/JavaScriptCore/dfg/DFGEdge.h
>+++ b/Source/JavaScriptCore/dfg/DFGEdge.h
>@@ -36,7 +36,7 @@ class AdjacencyList;
> 
> class Edge {
> public:
>-    explicit Edge(Node* node = 0, UseKind useKind = UntypedUse, ProofStatus proofStatus = NeedsCheck, KillStatus killStatus = DoesNotKill)
>+    explicit Edge(Node* node = nullptr, UseKind useKind = UntypedUse, ProofStatus proofStatus = NeedsCheck, KillStatus killStatus = DoesNotKill)
> #if USE(JSVALUE64)
>         : m_encodedWord(makeWord(node, useKind, proofStatus, killStatus))
> #else
>diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
>index 707bd773d717fbb44be8f87d2636d6b084175696..14254fa5721dadff61716366efb898c5bbb803e5 100644
>--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
>+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
>@@ -3214,6 +3214,7 @@ private:
>     {
>         TypedArrayType type = m_node->arrayMode().typedArrayType();
>         unsigned numExtraArgs = numExtraAtomicsArgs(m_node->op());
>+        ASSERT(numExtraArgs);
>         Edge baseEdge = m_graph.child(m_node, 0);
>         Edge indexEdge = m_graph.child(m_node, 1);
>         Edge argEdges[maxNumExtraAtomicsArgs];

Flags:

saam: review-
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189591: 349682 | 349697