Unreviewed, rolling out r191858.

https://bugs.webkit.org/show_bug.cgi?id=150780

Broke the build (Requested by ap on #webkit).

Reverted changeset:

"Rename op_put_getter_setter to op_put_getter_setter_by_id"
https://bugs.webkit.org/show_bug.cgi?id=150773
http://trac.webkit.org/changeset/191858

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index fc90e2ca2b606ced967b069a37626bf3ccc12122..1e7e98bb4d537ae14bae267d1582e1d9b9ca87f6 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2015-11-01  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r191858.
+        https://bugs.webkit.org/show_bug.cgi?id=150780
+
+        Broke the build (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Rename op_put_getter_setter to op_put_getter_setter_by_id"
+        https://bugs.webkit.org/show_bug.cgi?id=150773
+        http://trac.webkit.org/changeset/191858
+
 2015-11-01  Filip Pizlo  <fpizlo@apple.com>
 
         Unreviewed, add a FIXME referencing https://bugs.webkit.org/show_bug.cgi?id=150777.

diff --git a/Source/JavaScriptCore/bytecode/BytecodeList.json b/Source/JavaScriptCore/bytecode/BytecodeList.json
index ce82edd84cb17ac4ddfc38aa0d1869352809aa9d..854bf61c6bdf5af394c1283cf08dd144ab0b865e 100644 (file)
--- a/Source/JavaScriptCore/bytecode/BytecodeList.json
+++ b/Source/JavaScriptCore/bytecode/BytecodeList.json
@@ -67,7 +67,7 @@
             { "name" : "op_put_by_index", "length" : 4 },
             { "name" : "op_put_getter_by_id", "length" : 5 },
             { "name" : "op_put_setter_by_id", "length" : 5 },
-            { "name" : "op_put_getter_setter_by_id", "length" : 6 },
+            { "name" : "op_put_getter_setter", "length" : 6 },
             { "name" : "op_put_getter_by_val", "length" : 5 },
             { "name" : "op_put_setter_by_val", "length" : 5 },
             { "name" : "op_jmp", "length" : 2 },

diff --git a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
index 083e86b0e1ca3e082650f4663517ee242514efba..f77a872ba4929b072f9a30eed53b3664b4c96673 100644 (file)
--- a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
+++ b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
@@ -106,7 +106,7 @@ void computeUsesForBytecodeOffset(
         functor(codeBlock, instruction, opcodeID, instruction[4].u.operand);
         return;
     }
-    case op_put_getter_setter_by_id: {
+    case op_put_getter_setter: {
         functor(codeBlock, instruction, opcodeID, instruction[1].u.operand);
         functor(codeBlock, instruction, opcodeID, instruction[4].u.operand);
         functor(codeBlock, instruction, opcodeID, instruction[5].u.operand);
@@ -275,7 +275,7 @@ void computeDefsForBytecodeOffset(CodeBlock* codeBlock, unsigned bytecodeOffset,
     case op_put_by_id:
     case op_put_getter_by_id:
     case op_put_setter_by_id:
-    case op_put_getter_setter_by_id:
+    case op_put_getter_setter:
     case op_put_getter_by_val:
     case op_put_setter_by_val:
     case op_put_by_val:

diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index 58cf0595ef7e4796f75ad68823d74afce2659cc0..3085535818916f1dea114e8c9640eb0cc7041099 100644 (file)
--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -1076,13 +1076,13 @@ void CodeBlock::dumpBytecode(
             out.printf("%s, %s, %d, %s", registerName(r0).data(), idName(id0, identifier(id0)).data(), n0, registerName(r1).data());
             break;
         }
-        case op_put_getter_setter_by_id: {
+        case op_put_getter_setter: {
             int r0 = (++it)->u.operand;
             int id0 = (++it)->u.operand;
             int n0 = (++it)->u.operand;
             int r1 = (++it)->u.operand;
             int r2 = (++it)->u.operand;
-            printLocationAndOp(out, exec, location, it, "put_getter_setter_by_id");
+            printLocationAndOp(out, exec, location, it, "put_getter_setter");
             out.printf("%s, %s, %d, %s, %s", registerName(r0).data(), idName(id0, identifier(id0)).data(), n0, registerName(r1).data(), registerName(r2).data());
             break;
         }

diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index 76165b2a9c990626115c8ae881c84905389e3ec8..17bf1c42e342b9b8542d60067f1491c74d12d69b 100644 (file)
--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -2170,7 +2170,7 @@ void BytecodeGenerator::emitPutGetterSetter(RegisterID* base, const Identifier&
 
     m_staticPropertyAnalyzer.putById(base->index(), propertyIndex);
 
-    emitOpcode(op_put_getter_setter_by_id);
+    emitOpcode(op_put_getter_setter);
     instructions().append(base->index());
     instructions().append(propertyIndex);
     instructions().append(attributes);

diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
index f5912d67464dcde749a8eb97d52578cdb249beb2..a7fcb2a6e0dc4849011c68d65d8cfa786f9715d2 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
@@ -3760,14 +3760,14 @@ bool ByteCodeParser::parseBlock(unsigned limit)
             NEXT_OPCODE(op_put_getter_by_id);
         }
 
-        case op_put_getter_setter_by_id: {
+        case op_put_getter_setter: {
             Node* base = get(VirtualRegister(currentInstruction[1].u.operand));
             unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[2].u.operand];
             unsigned attributes = currentInstruction[3].u.operand;
             Node* getter = get(VirtualRegister(currentInstruction[4].u.operand));
             Node* setter = get(VirtualRegister(currentInstruction[5].u.operand));
             addToGraph(PutGetterSetterById, OpInfo(identifierNumber), OpInfo(attributes), base, getter, setter);
-            NEXT_OPCODE(op_put_getter_setter_by_id);
+            NEXT_OPCODE(op_put_getter_setter);
         }
 
         case op_put_getter_by_val:

diff --git a/Source/JavaScriptCore/dfg/DFGCapabilities.cpp b/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
index cda14c39975fd6c80e6fb892a9caea3bbd9ded2b..9788a484a13aba2f91ee113050e6e59ac6ab8431 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
+++ b/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
@@ -156,7 +156,7 @@ CapabilityLevel capabilityLevel(OpcodeID opcodeID, CodeBlock* codeBlock, Instruc
     case op_put_by_id:
     case op_put_getter_by_id:
     case op_put_setter_by_id:
-    case op_put_getter_setter_by_id:
+    case op_put_getter_setter:
     case op_put_getter_by_val:
     case op_put_setter_by_val:
     case op_jmp:

diff --git a/Source/JavaScriptCore/jit/JIT.cpp b/Source/JavaScriptCore/jit/JIT.cpp
index cb55adc2577f012ee165a2db3378090cbff63fc0..5fad85be574767d5237329293712e6b3f272dd43 100644 (file)
--- a/Source/JavaScriptCore/jit/JIT.cpp
+++ b/Source/JavaScriptCore/jit/JIT.cpp
@@ -278,7 +278,7 @@ void JIT::privateCompileMainPass()
         DEFINE_OP(op_put_by_val)
         DEFINE_OP(op_put_getter_by_id)
         DEFINE_OP(op_put_setter_by_id)
-        DEFINE_OP(op_put_getter_setter_by_id)
+        DEFINE_OP(op_put_getter_setter)
         DEFINE_OP(op_put_getter_by_val)
         DEFINE_OP(op_put_setter_by_val)
 

diff --git a/Source/JavaScriptCore/jit/JIT.h b/Source/JavaScriptCore/jit/JIT.h
index e4c028c24ae0cf5559145b660987a6419612d30f..410a8cbba4cccc1e4d61dd2d883c4f03b66947ea 100755 (executable)
--- a/Source/JavaScriptCore/jit/JIT.h
+++ b/Source/JavaScriptCore/jit/JIT.h
@@ -560,7 +560,7 @@ namespace JSC {
         void emit_op_put_by_val(Instruction*);
         void emit_op_put_getter_by_id(Instruction*);
         void emit_op_put_setter_by_id(Instruction*);
-        void emit_op_put_getter_setter_by_id(Instruction*);
+        void emit_op_put_getter_setter(Instruction*);
         void emit_op_put_getter_by_val(Instruction*);
         void emit_op_put_setter_by_val(Instruction*);
         void emit_op_ret(Instruction*);

diff --git a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
index 8b3bb8b022d7dbb4b78df3e905a5f5be68b2fec7..3179f98e58030d61f0eb6ca14f9b32486a4444b4 100644 (file)
--- a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
+++ b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
@@ -503,7 +503,7 @@ void JIT::emit_op_put_setter_by_id(Instruction* currentInstruction)
     callOperation(operationPutSetterById, regT0, m_codeBlock->identifier(currentInstruction[2].u.operand).impl(), options, regT1);
 }
 
-void JIT::emit_op_put_getter_setter_by_id(Instruction* currentInstruction)
+void JIT::emit_op_put_getter_setter(Instruction* currentInstruction)
 {
     emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
     int32_t attribute = currentInstruction[3].u.operand;

diff --git a/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp b/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
index ce93d4140dfda0bdaf332c7302756825eaf24478..6892e09600d11e8593cd808b5d68aea66e2b4e1c 100644 (file)
--- a/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
+++ b/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
@@ -81,7 +81,7 @@ void JIT::emit_op_put_setter_by_id(Instruction* currentInstruction)
     callOperation(operationPutSetterById, regT1, m_codeBlock->identifier(property).impl(), options, regT3);
 }
 
-void JIT::emit_op_put_getter_setter_by_id(Instruction* currentInstruction)
+void JIT::emit_op_put_getter_setter(Instruction* currentInstruction)
 {
     int base = currentInstruction[1].u.operand;
     int property = currentInstruction[2].u.operand;

diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
index 765f197950e323f0566e72c73b4eed63e3b208c5..e187f61c4fc67a681a16b7f6d50a31d51a4fbe09 100644 (file)
--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
@@ -861,7 +861,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_setter_by_id)
     LLINT_END();
 }
 
-LLINT_SLOW_PATH_DECL(slow_path_put_getter_setter_by_id)
+LLINT_SLOW_PATH_DECL(slow_path_put_getter_setter)
 {
     LLINT_BEGIN();
     ASSERT(LLINT_OP(1).jsValue().isObject());

diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.h b/Source/JavaScriptCore/llint/LLIntSlowPaths.h
index e244829fdd1e2f1506a35d10a4eb81fcbe32c531..32790db3a51c395c3a7072f2ee22b8143183f5a1 100644 (file)
--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.h
+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.h
@@ -81,7 +81,7 @@ LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_del_by_val);
 LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_by_index);
 LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_getter_by_id);
 LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_setter_by_id);
-LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_getter_setter_by_id);
+LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_getter_setter);
 LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_getter_by_val);
 LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_setter_by_val);
 LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_jtrue);

diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
index 4f4ad9bd4e2d71b368b9dc4703484f689c85ecec..daf5786414d07940bb7f1663b908744e32715592 100644 (file)
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
@@ -1334,9 +1334,9 @@ _llint_op_put_setter_by_id:
     dispatch(5)
 
 
-_llint_op_put_getter_setter_by_id:
+_llint_op_put_getter_setter:
     traceExecution()
-    callSlowPath(_llint_slow_path_put_getter_setter_by_id)
+    callSlowPath(_llint_slow_path_put_getter_setter)
     dispatch(6)