Unreviewed, forgot to add { }
authorkeith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Dec 2017 00:12:06 +0000 (00:12 +0000)
committerkeith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Dec 2017 00:12:06 +0000 (00:12 +0000)
* runtime/JSObject.h:
(JSC::JSObject::setButterfly):
(JSC::JSObject::nukeStructureAndSetButterfly):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225943 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/JSObject.h

index 4441f73..2cd296d 100644 (file)
@@ -1,3 +1,11 @@
+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>
 
         Web Inspector: replace HTMLCanvasElement with CanvasRenderingContext for instrumentation logic
index 0ae9b2f..79fe444 100644 (file)
@@ -1265,9 +1265,11 @@ inline void JSObject::setButterflyWithIndexingMask(VM& vm, Butterfly* butterfly,
 
 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();
         m_butterfly.set(vm, this, butterfly);
@@ -1280,9 +1282,11 @@ inline void JSObject::setButterfly(VM& vm, Butterfly* butterfly)
 
 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));
         WTF::storeStoreFence();