Changeset 205507 in webkit for trunk/Source/JavaScriptCore/dfg/DFGEdge.h

Timestamp:

Sep 6, 2016, 2:35:24 PM (9 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r205504.
​https://bugs.webkit.org/show_bug.cgi?id=161645

Broke the iOS device build (Requested by ryanhaddad on
#webkit).

Reverted changeset:

"Make JSMap and JSSet faster"
​https://bugs.webkit.org/show_bug.cgi?id=160989
​http://trac.webkit.org/changeset/205504

Patch by Commit Queue <​[email protected]> on 2016-09-06

File:

• trunk/Source/JavaScriptCore/dfg/DFGEdge.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGEdge.h

@@ -190 +190 @@
     
 #if USE(JSVALUE64)
-    static constexpr uint32_t shift() { return 8; }
+    static uint32_t shift() { return 7; }
     
     static uintptr_t makeWord(Node* node, UseKind useKind, ProofStatus proofStatus, KillStatus killStatus)
@@ -198 +198 @@
         ASSERT((shiftedValue >> shift()) == bitwise_cast<uintptr_t>(node));
         ASSERT(useKind >= 0 && useKind < LastUseKind);
-        static_assert((static_cast<uintptr_t>(LastUseKind) << 2) < (static_cast<uintptr_t>(1) << shift()), "We rely on this being true to not clobber the node pointer.");
-        uintptr_t result = shiftedValue | (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | static_cast<uintptr_t>(DFG::isProved(proofStatus));
-        if (!ASSERT_DISABLED) {
-            union U {
-                U() { word = 0; }
-                uintptr_t word;
-                Edge edge;
-            } u;
-            u.word = result;
-            ASSERT(u.edge.useKindUnchecked() == useKind);
-            ASSERT(u.edge.node() == node);
-            ASSERT(u.edge.proofStatusUnchecked() == proofStatus);
-            ASSERT(u.edge.killStatusUnchecked() == killStatus);
-        }
-        return result;
+        ASSERT((static_cast<uintptr_t>(LastUseKind) << 2) <= (static_cast<uintptr_t>(2) << shift()));
+        return shiftedValue | (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | static_cast<uintptr_t>(DFG::isProved(proofStatus));
     }