Changeset 216459 in webkit

Timestamp:

May 8, 2017, 3:24:29 PM (8 years ago)

Author:

mark.lam@apple.com

Message:

op_throw_static_error's use of its first operand should be reflected in DFG BytecodeUseDef as well.
​https://bugs.webkit.org/show_bug.cgi?id=171786
<rdar://problem/32051023>

Reviewed by Saam Barati.

JSTests:

• stress/bug-171786.js: Added.

Source/JavaScriptCore:

• bytecode/BytecodeDumper.cpp:

(JSC::BytecodeDumper<Block>::dumpBytecode):

• Fix BytecodeDumper to dump op_throw_static_error correctly. Previously, it was expecting op1 to always be a constant. r206870 changed it to take a variable string as well.

• bytecode/BytecodeUseDef.h:

(JSC::computeUsesForBytecodeOffset):

• Fix the bug.

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• Move the Phantom of op1 after the ThrowStaticError node, because technically, the ThrowStaticError represents op_throw_static_error, and op_throw_static_error uses op1. In practice, this probably doesn't matter, but let's have the code accurately communicate the behavior we're expecting.

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/bug-171786.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/bytecode/BytecodeDumper.cpp (modified) (1 diff)
• Source/JavaScriptCore/bytecode/BytecodeUseDef.h (modified) (2 diffs)
• Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-05-08  Mark Lam  <mark.lam@apple.com>
+
+        op_throw_static_error's use of its first operand should be reflected in DFG BytecodeUseDef as well.
+        https://bugs.webkit.org/show_bug.cgi?id=171786
+        <rdar://problem/32051023>
+
+        Reviewed by Saam Barati.
+
+        * stress/bug-171786.js: Added.
+
 2017-05-06  Oleksandr Skachkov  <gskachkov@gmail.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-05-08  Mark Lam  <mark.lam@apple.com>
+
+        op_throw_static_error's use of its first operand should be reflected in DFG BytecodeUseDef as well.
+        https://bugs.webkit.org/show_bug.cgi?id=171786
+        <rdar://problem/32051023>
+
+        Reviewed by Saam Barati.
+
+        * bytecode/BytecodeDumper.cpp:
+        (JSC::BytecodeDumper<Block>::dumpBytecode):
+        - Fix BytecodeDumper to dump op_throw_static_error correctly.  Previously,
+          it was expecting op1 to always be a constant.  r206870 changed it to take a
+          variable string as well.
+
+        * bytecode/BytecodeUseDef.h:
+        (JSC::computeUsesForBytecodeOffset):
+        - Fix the bug.
+
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::parseBlock):
+        - Move the Phantom of op1 after the ThrowStaticError node, because technically,
+          the ThrowStaticError represents op_throw_static_error, and op_throw_static_error
+          uses op1.  In practice, this probably doesn't matter, but let's have the code
+          accurately communicate the behavior we're expecting.
+
 2017-05-08  JF Bastien  <jfbastien@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp

@@ -1544 +1544 @@
     }
     case op_throw_static_error: {
-        int k0 = (++it)->u.operand;
+        int r0 = (++it)->u.operand;
         ErrorType k1 = static_cast<ErrorType>((++it)->u.unsignedValue);
         printLocationAndOp(out, location, it, "throw_static_error");
-        out.printf("%s, ", constantName(k0).data());
+        out.printf("%s, ", registerName(r0).data());
         out.print(k1);
         break;

trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h

@@ -41 +41 @@
     case op_new_regexp:
     case op_new_array_buffer:
-    case op_throw_static_error:
     case op_debug:
     case op_jneq_ptr:
@@ -71 +70 @@
     case op_dec:
     case op_inc:
-    case op_log_shadow_chicken_prologue: {
+    case op_log_shadow_chicken_prologue:
+    case op_throw_static_error: {
         ASSERT(opcodeLengths[opcodeID] > 1);
         functor(codeBlock, instruction, opcodeID, instruction[1].u.operand);

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -5038 +5038 @@
             
         case op_throw_static_error:
+            addToGraph(ThrowStaticError);
             addToGraph(Phantom, get(VirtualRegister(currentInstruction[1].u.operand))); // Keep argument live.
-            addToGraph(ThrowStaticError);
             flushForTerminal();
             addToGraph(Unreachable);