Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (191861 => 191862)
--- trunk/Source/_javascript_Core/ChangeLog 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-11-01 22:44:33 UTC (rev 191862)
@@ -1,3 +1,16 @@
+2015-11-01 Commit Queue <commit-qu...@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 <fpi...@apple.com>
Unreviewed, add a FIXME referencing https://bugs.webkit.org/show_bug.cgi?id=150777.
Modified: trunk/Source/_javascript_Core/bytecode/BytecodeList.json (191861 => 191862)
--- trunk/Source/_javascript_Core/bytecode/BytecodeList.json 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/bytecode/BytecodeList.json 2015-11-01 22:44:33 UTC (rev 191862)
@@ -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 },
Modified: trunk/Source/_javascript_Core/bytecode/BytecodeUseDef.h (191861 => 191862)
--- trunk/Source/_javascript_Core/bytecode/BytecodeUseDef.h 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/bytecode/BytecodeUseDef.h 2015-11-01 22:44:33 UTC (rev 191862)
@@ -106,7 +106,7 @@
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 @@
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:
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -1076,13 +1076,13 @@
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;
}
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -2170,7 +2170,7 @@
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);
Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -3760,14 +3760,14 @@
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:
Modified: trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -156,7 +156,7 @@
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:
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -278,7 +278,7 @@
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)
Modified: trunk/Source/_javascript_Core/jit/JIT.h (191861 => 191862)
--- trunk/Source/_javascript_Core/jit/JIT.h 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/jit/JIT.h 2015-11-01 22:44:33 UTC (rev 191862)
@@ -560,7 +560,7 @@
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*);
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -503,7 +503,7 @@
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;
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -81,7 +81,7 @@
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;
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (191861 => 191862)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2015-11-01 22:44:33 UTC (rev 191862)
@@ -861,7 +861,7 @@
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());
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h (191861 => 191862)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h 2015-11-01 22:44:33 UTC (rev 191862)
@@ -81,7 +81,7 @@
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);
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (191861 => 191862)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2015-11-01 21:59:42 UTC (rev 191861)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2015-11-01 22:44:33 UTC (rev 191862)
@@ -1334,9 +1334,9 @@
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)
