Changeset 106314 in webkit

Timestamp:

Jan 30, 2012 6:22:37 PM (12 years ago)

Author:

oliver@apple.com

Message:

get_by_val_arguments is broken in the interpreter
​https://bugs.webkit.org/show_bug.cgi?id=77389

Reviewed by Gavin Barraclough.

When get_by_val had wad a value profile added, the same slot was not added to
get_by_val_arguments. This broke the interpreter as the interpreter falls
back on its regular get_by_val implementation.

No tests are added as the interpreter is fairly broken in its
current state (multiple tests fail due to this bug).

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):

• bytecode/Opcode.h:

(JSC):
():

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitGetArgumentByVal):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• bytecode/Opcode.h (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-30  Oliver Hunt  <oliver@apple.com>
+
+        get_by_val_arguments is broken in the interpreter
+        https://bugs.webkit.org/show_bug.cgi?id=77389
+
+        Reviewed by Gavin Barraclough.
+
+        When get_by_val had wad a value profile added, the same slot was not added to
+        get_by_val_arguments.  This broke the interpreter as the interpreter falls
+        back on its regular get_by_val implementation.
+
+        No tests are added as the interpreter is fairly broken in its
+        current state (multiple tests fail due to this bug).
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::dump):
+        * bytecode/Opcode.h:
+        (JSC):
+        ():
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::emitGetArgumentByVal):
+
 2012-01-30  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -935 +935 @@
             int r2 = (++it)->u.operand;
             printf("[%4d] get_argument_by_val\t %s, %s, %s\n", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data());
+            ++it;
             break;
         }

trunk/Source/JavaScriptCore/bytecode/Opcode.h

@@ -128 +128 @@
         macro(op_del_by_id, 4) \
         macro(op_get_by_val, 5) /* has value profiling */ \
-        macro(op_get_argument_by_val, 4) \
+        macro(op_get_argument_by_val, 5) /* must be the same size as op_get_by_val */ \
         macro(op_get_by_pname, 7) \
         macro(op_put_by_val, 4) \

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -1594 +1594 @@
 RegisterID* BytecodeGenerator::emitGetArgumentByVal(RegisterID* dst, RegisterID* base, RegisterID* property)
 {
-    emitOpcode(op_get_argument_by_val);
+    ValueProfile* profile = emitProfiledOpcode(op_get_argument_by_val);
     instructions().append(dst->index());
     ASSERT(base->index() == m_codeBlock->argumentsRegister());
     instructions().append(base->index());
     instructions().append(property->index());
+    instructions().append(profile);
     return dst;
 }