Title: [225943] trunk/Source/_javascript_Core
- Revision
- 225943
- Author
- keith_mil...@apple.com
- Date
- 2017-12-14 16:12:06 -0800 (Thu, 14 Dec 2017)
Log Message
Unreviewed, forgot to add { }
* runtime/JSObject.h:
(JSC::JSObject::setButterfly):
(JSC::JSObject::nukeStructureAndSetButterfly):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (225942 => 225943)
--- trunk/Source/_javascript_Core/ChangeLog 2017-12-15 00:02:42 UTC (rev 225942)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-12-15 00:12:06 UTC (rev 225943)
@@ -1,3 +1,11 @@
+2017-12-14 Keith Miller <keith_mil...@apple.com>
+
+ Unreviewed, forgot to add { }
+
+ * runtime/JSObject.h:
+ (JSC::JSObject::setButterfly):
+ (JSC::JSObject::nukeStructureAndSetButterfly):
+
2017-12-14 Devin Rousso <web...@devinrousso.com>
Web Inspector: replace HTMLCanvasElement with CanvasRenderingContext for instrumentation logic
Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (225942 => 225943)
--- trunk/Source/_javascript_Core/runtime/JSObject.h 2017-12-15 00:02:42 UTC (rev 225942)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h 2017-12-15 00:12:06 UTC (rev 225943)
@@ -1265,9 +1265,11 @@
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::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();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
