Changeset 225943 in webkit

Timestamp:

Dec 14, 2017, 4:12:06 PM (9 years ago)

Author:

keith_miller@apple.com

Message:

Unreviewed, forgot to add { }

• runtime/JSObject.h:

(JSC::JSObject::setButterfly):
(JSC::JSObject::nukeStructureAndSetButterfly):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSObject.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-12-14  Keith Miller  <keith_miller@apple.com>
+
+        Unreviewed, forgot to add { }
+
+        * runtime/JSObject.h:
+        (JSC::JSObject::setButterfly):
+        (JSC::JSObject::nukeStructureAndSetButterfly):
+
 2017-12-14  Devin Rousso  <webkit@devinrousso.com>
 

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -1266 +1266 @@
 inline void JSObject::setButterfly(VM& vm, Butterfly* butterfly)
 {
-    if (LIKELY(!structure(vm)->hijacksIndexingHeader()))
+    if (LIKELY(!structure(vm)->hijacksIndexingHeader())) {
         m_butterflyIndexingMask = butterfly->computeIndexingMask();
-    ASSERT(m_butterflyIndexingMask >= butterfly->vectorLength());
+        ASSERT(m_butterflyIndexingMask >= butterfly->vectorLength());
+    }
+
     if (isX86() || vm.heap.mutatorShouldBeFenced()) {
         WTF::storeStoreFence();
@@ -1281 +1283 @@
 inline void JSObject::nukeStructureAndSetButterfly(VM& vm, StructureID oldStructureID, Butterfly* butterfly)
 {
-    if (LIKELY(!vm.getStructure(oldStructureID)->hijacksIndexingHeader()))
+    if (LIKELY(!vm.getStructure(oldStructureID)->hijacksIndexingHeader())) {
         m_butterflyIndexingMask = butterfly->computeIndexingMask();
-    ASSERT(m_butterflyIndexingMask >= butterfly->vectorLength());
+        ASSERT(m_butterflyIndexingMask >= butterfly->vectorLength());
+    }
+
     if (isX86() || vm.heap.mutatorShouldBeFenced()) {
         setStructureIDDirectly(nuke(oldStructureID));