Changeset 281665 in webkit

Timestamp:

Aug 26, 2021, 3:43:32 PM (5 years ago)

Author:

sbarati@apple.com

Message:

r281485 was not sufficient in where it called disablePeepholeOptimization
​https://bugs.webkit.org/show_bug.cgi?id=229582
<rdar://82346980>

Reviewed by Yusuke Suzuki.

JSTests:

• stress/for-in-disable-bytecode-generator-peephole-optimizations-after-rewrite-2.js: Added.

(foo):

Source/JavaScriptCore:

r281485 accidentally deleted a place where we called disablePeepholeOptimization
that was necessary. Basically, after we seek where the current instruction
in BytecodeGenerator is, we need to disablePeepholeOptimization.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::ForInContext::finalize):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/for-in-disable-bytecode-generator-peephole-optimizations-after-rewrite-2.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (modified) (2 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-08-26  Saam Barati  <sbarati@apple.com>
+
+        r281485 was not sufficient in where it called disablePeepholeOptimization
+        https://bugs.webkit.org/show_bug.cgi?id=229582
+        <rdar://82346980>
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/for-in-disable-bytecode-generator-peephole-optimizations-after-rewrite-2.js: Added.
+        (foo):
+
 2021-08-24  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-08-26  Saam Barati  <sbarati@apple.com>
+
+        r281485 was not sufficient in where it called disablePeepholeOptimization
+        https://bugs.webkit.org/show_bug.cgi?id=229582
+        <rdar://82346980>
+
+        Reviewed by Yusuke Suzuki.
+
+        r281485 accidentally deleted a place where we called disablePeepholeOptimization
+        that was necessary. Basically, after we seek where the current instruction
+        in BytecodeGenerator is, we need to disablePeepholeOptimization.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::ForInContext::finalize):
+
 2021-08-26  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -5387 +5387 @@
 
         generator.m_writer.seek(branchInstIndex);
+        generator.disablePeepholeOptimization();
 
         OpJmp::emit(&generator, BoundLabel(static_cast<int>(newBranchTarget) - static_cast<int>(branchInstIndex)));
@@ -5394 +5395 @@
     }
 
+    generator.m_writer.seek(generator.m_writer.size());
     generator.disablePeepholeOptimization(); // We might've just changed the last bytecode that was emitted.
-
-    generator.m_writer.seek(generator.m_writer.size());
 }