Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (202632 => 202633)
--- trunk/Source/_javascript_Core/ChangeLog 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-06-29 18:25:40 UTC (rev 202633)
@@ -1,3 +1,17 @@
+2016-06-29 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r202627.
+ https://bugs.webkit.org/show_bug.cgi?id=159266
+
+ patch is broken on arm (Requested by keith_miller on #webkit).
+
+ Reverted changeset:
+
+ "LLInt should support other types of prototype GetById
+ caching."
+ https://bugs.webkit.org/show_bug.cgi?id=158083
+ http://trac.webkit.org/changeset/202627
+
2016-06-29 Benjamin Poulain <[email protected]>
[JSC] Fix small issues of TypedArray prototype
Modified: trunk/Source/_javascript_Core/bytecode/BytecodeList.json (202632 => 202633)
--- trunk/Source/_javascript_Core/bytecode/BytecodeList.json 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/bytecode/BytecodeList.json 2016-06-29 18:25:40 UTC (rev 202633)
@@ -64,8 +64,6 @@
{ "name" : "op_get_by_id", "length" : 9 },
{ "name" : "op_get_by_id_proto_load", "length" : 9 },
{ "name" : "op_get_by_id_unset", "length" : 9 },
- { "name" : "op_get_by_id_proto_accessor", "length" : 9 },
- { "name" : "op_get_by_id_proto_custom", "length" : 9 },
{ "name" : "op_get_by_id_with_this", "length" : 5 },
{ "name" : "op_get_by_val_with_this", "length" : 5 },
{ "name" : "op_try_get_by_id", "length" : 4 },
Modified: trunk/Source/_javascript_Core/bytecode/BytecodeUseDef.h (202632 => 202633)
--- trunk/Source/_javascript_Core/bytecode/BytecodeUseDef.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/bytecode/BytecodeUseDef.h 2016-06-29 18:25:40 UTC (rev 202633)
@@ -164,8 +164,6 @@
case op_get_by_id:
case op_get_by_id_proto_load:
case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
case op_get_array_length:
case op_typeof:
case op_is_empty:
@@ -405,8 +403,6 @@
case op_get_by_id:
case op_get_by_id_proto_load:
case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
case op_get_by_id_with_this:
case op_get_by_val_with_this:
case op_get_array_length:
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (202632 => 202633)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-06-29 18:25:40 UTC (rev 202633)
@@ -354,12 +354,6 @@
case op_get_by_id_unset:
op = "get_by_id_unset";
break;
- case op_get_by_id_proto_accessor:
- op = "op_get_by_id_proto_accessor";
- break;
- case op_get_by_id_proto_custom:
- op = "op_get_by_id_proto_custom";
- break;
case op_get_array_length:
op = "array_length";
break;
@@ -1143,8 +1137,6 @@
case op_get_by_id:
case op_get_by_id_proto_load:
case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
case op_get_array_length: {
printGetByIdOp(out, exec, location, it);
printGetByIdCacheStatus(out, exec, location, stubInfos);
@@ -2804,9 +2796,7 @@
switch (interpreter->getOpcodeID(curInstruction[0].u.opcode)) {
case op_get_by_id:
case op_get_by_id_proto_load:
- case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom: {
+ case op_get_by_id_unset: {
StructureID oldStructureID = curInstruction[4].u.structureID;
if (!oldStructureID || Heap::isMarked(m_vm->heap.structureIDTable().get(oldStructureID)))
break;
Modified: trunk/Source/_javascript_Core/bytecode/GetByIdStatus.cpp (202632 => 202633)
--- trunk/Source/_javascript_Core/bytecode/GetByIdStatus.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/bytecode/GetByIdStatus.cpp 2016-06-29 18:25:40 UTC (rev 202633)
@@ -78,7 +78,7 @@
Opcode opcode = instruction[0].u.opcode;
- ASSERT(opcode == LLInt::getOpcode(op_get_array_length) || opcode == LLInt::getOpcode(op_try_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_proto_load) || opcode == LLInt::getOpcode(op_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_unset) || opcode == LLInt::getOpcode(op_get_by_id_proto_accessor) || opcode == LLInt::getOpcode(op_get_by_id_proto_custom));
+ ASSERT(opcode == LLInt::getOpcode(op_get_array_length) || opcode == LLInt::getOpcode(op_try_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_proto_load) || opcode == LLInt::getOpcode(op_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_unset));
// FIXME: We should not just bail if we see a try_get_by_id or a get_by_id_proto_load.
// https://bugs.webkit.org/show_bug.cgi?id=158039
Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h (202632 => 202633)
--- trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h 2016-06-29 18:25:40 UTC (rev 202633)
@@ -107,7 +107,6 @@
};
class UnlinkedCodeBlock : public JSCell {
- friend class LLIntOffsetsExtractor;
public:
typedef JSCell Base;
static const unsigned StructureFlags = Base::StructureFlags;
Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (202632 => 202633)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2016-06-29 18:25:40 UTC (rev 202633)
@@ -4145,8 +4145,6 @@
case op_get_by_id:
case op_get_by_id_proto_load:
case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
case op_get_array_length: {
SpeculatedType prediction = getPrediction();
Modified: trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp (202632 => 202633)
--- trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp 2016-06-29 18:25:40 UTC (rev 202633)
@@ -158,8 +158,6 @@
case op_get_by_id:
case op_get_by_id_proto_load:
case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
case op_get_by_id_with_this:
case op_get_by_val_with_this:
case op_get_array_length:
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (202632 => 202633)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2016-06-29 18:25:40 UTC (rev 202633)
@@ -250,8 +250,6 @@
case op_get_array_length:
case op_get_by_id_proto_load:
case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
DEFINE_OP(op_get_by_id)
DEFINE_OP(op_get_by_id_with_this)
DEFINE_OP(op_get_by_val)
@@ -437,8 +435,6 @@
case op_get_array_length:
case op_get_by_id_proto_load:
case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
DEFINE_SLOWCASE_OP(op_get_by_id)
DEFINE_SLOWCASE_OP(op_get_by_val)
DEFINE_SLOWCASE_OP(op_instanceof)
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (202632 => 202633)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-06-29 18:25:40 UTC (rev 202633)
@@ -598,8 +598,6 @@
ObjectPropertyConditionSet conditions;
if (slot.isUnset())
conditions = generateConditionsForPropertyMiss(vm, codeBlock, exec, structure, ident.impl());
- else if (slot.isCustom())
- conditions = generateConditionsForPrototypePropertyHitCustom(vm, codeBlock, exec, structure, slot.slotBase(), ident.impl());
else
conditions = generateConditionsForPrototypePropertyHit(vm, codeBlock, exec, structure, slot.slotBase(), ident.impl());
@@ -616,7 +614,7 @@
offset = condition.condition().offset();
result.iterator->value.add(condition, pc)->install();
}
- ASSERT((offset == invalidOffset) == (slot.isUnset() || slot.isCustom()));
+ ASSERT((offset == invalidOffset) == slot.isUnset());
ConcurrentJITLocker locker(codeBlock->m_lock);
@@ -624,20 +622,10 @@
pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_unset);
pc[4].u.structureID = structure->id();
return;
- } else if (slot.isCustom()) {
- pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_custom);
- pc[4].u.structureID = structure->id();
- pc[5].u.getterFunc = slot.customGetter();
- pc[6].u.pointer = slot.attributes() & CustomAccessor ? 0 : slot.slotBase();
- return;
}
- ASSERT(slot.isValue() || slot.isAccessor());
+ ASSERT(slot.isValue());
- if (slot.isAccessor())
- pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_accessor);
- else
- pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_load);
-
+ pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_load);
pc[4].u.structureID = structure->id();
pc[5].u.operand = offset;
// We know that this pointer will remain valid because it will be cleared by either a watchpoint fire or
@@ -678,12 +666,10 @@
ConcurrentJITLocker locker(codeBlock->m_lock);
- if (slot.isValue()) {
- pc[4].u.structureID = structure->id();
- pc[5].u.operand = slot.cachedOffset();
- }
+ pc[4].u.structureID = structure->id();
+ pc[5].u.operand = slot.cachedOffset();
}
- } else if (UNLIKELY(pc[7].u.operand && (slot.isValue() || slot.isUnset() || ((slot.isAccessor() || slot.isCustom()) && (slot.slotBase() != baseValue))))) {
+ } else if (UNLIKELY(pc[7].u.operand && (slot.isValue() || slot.isUnset()))) {
ASSERT(slot.slotBase() != baseValue);
if (!(--pc[7].u.operand))
@@ -705,19 +691,6 @@
LLINT_END();
}
-LLINT_SLOW_PATH_DECL(slow_path_get_proto_accessor)
-{
- LLINT_BEGIN();
- JSValue baseValue = LLINT_OP_C(2).jsValue();
- PropertyOffset offset = pc[5].u.operand;
- JSObject* slotBase = jsCast<JSObject*>(pc[6].u.jsCell.get());
- JSValue getterSetter = slotBase->getDirect(offset);
-
- JSValue result = callGetter(exec, baseValue, getterSetter);
-
- LLINT_RETURN_PROFILED(op_get_by_id, result);
-}
-
LLINT_SLOW_PATH_DECL(slow_path_get_arguments_length)
{
LLINT_BEGIN();
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h (202632 => 202633)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h 2016-06-29 18:25:40 UTC (rev 202633)
@@ -73,7 +73,6 @@
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_instanceof_custom);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_try_get_by_id);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_by_id);
-LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_proto_accessor);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_arguments_length);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_by_id);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_del_by_id);
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (202632 => 202633)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2016-06-29 18:25:40 UTC (rev 202633)
@@ -423,16 +423,6 @@
end
end
-macro loadIdentifier(index, dest)
- loadp CodeBlock[cfr], t1
- loadp CodeBlock::m_unlinkedCode[t1], t2
- loadp UnlinkedCodeBlock::m_identifiers[t2], t1
- move index, t2
- mulp sizeof Identifier, t2
- addp t2, t1
- loadp Identifier::m_string[t1], dest
-end
-
macro checkStackPointerAlignment(tempReg, location)
if ARM64 or C_LOOP or SH4
# ARM64 will check for us!
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (202632 => 202633)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2016-06-29 18:25:40 UTC (rev 202633)
@@ -1423,66 +1423,6 @@
dispatch(9)
-_llint_op_get_by_id_proto_accessor:
- traceExecution()
- loadi 8[PC], t0
- loadi 16[PC], t1
- loadConstantOrVariablePayload(t0, CellTag, t3, .opGetByIdProtoAcessorSlow)
- bineq JSCell::m_structureID[t3], t1, .opGetByIdProtoAcessorSlow
- callSlowPath(_llint_slow_path_get_proto_accessor)
- dispatch(9)
-
-.opGetByIdProtoAcessorSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-macro loadEncodedThisValue(baseValue, dest)
- loadp 24[PC], dest
- bineq 0, dest, .loadEncodedThisValueDone
- move baseValue, dest
- .loadEncodedThisValueDone:
-end
-
-_llint_op_get_by_id_proto_custom:
- traceExecution()
- loadi 8[PC], t0
- loadi 16[PC], t1
- loadConstantOrVariablePayload(t0, CellTag, t3, .opGetByIdProtoCustomSlow)
- bineq JSCell::m_structureID[t3], t1, .opGetByIdProtoCustomSlow
- # Setting the topCallFrame
- loadp Callee[cfr], t0
- andp MarkedBlockMask, t0, t1
- loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
- storep cfr, VM::topCallFrame[t1]
- loadi 12[PC], t0
- loadIdentifier(t0, t2)
- loadEncodedThisValue(t3, t1)
- loadp 20[PC], t0
- # Inlining the GetValueFunc call
- push t1 # Load arg3 JSObject *
- push t2 # Load arg2 PropertyName
- move CellTag, t3
- if BIG_ENDIAN
- push t1 # Load arg1 Payload of EncodedJSValue
- push t3 # Load arg1 Tag of EncodedJSValue
- else
- push t3 # Load arg1 Tag of EncodedJSValue
- push t1 # Load arg1 Payload of EncodedJSValue
- end
- push cfr # Loading exec
- call t0
- addp 20, sp
- loadi 4[PC], t2
- storei r1, TagOffset[cfr, t2, 8]
- storei r0, PayloadOffset[cfr, t2, 8]
- valueProfile(r0, r1, 32, t2)
- dispatch(9)
-
-.opGetByIdProtoCustomSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-
_llint_op_get_array_length:
traceExecution()
loadi 8[PC], t0
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (202632 => 202633)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2016-06-29 18:25:40 UTC (rev 202633)
@@ -1294,63 +1294,6 @@
dispatch(9)
-_llint_op_get_by_id_proto_accessor:
- traceExecution()
- loadisFromInstruction(2, t0)
- loadConstantOrVariableCell(t0, t3, .opGetByIdProtoAcessorSlow)
- loadi JSCell::m_structureID[t3], t1
- loadisFromInstruction(4, t2)
- bineq t2, t1, .opGetByIdProtoAcessorSlow
- callSlowPath(_llint_slow_path_get_proto_accessor)
- dispatch(9)
-
-.opGetByIdProtoAcessorSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-
-macro loadEncodedThisValue(baseValue, dest)
- loadpFromInstruction(6, dest)
- bineq 0, dest, .loadEncodedThisValueDone
- move baseValue, dest
- .loadEncodedThisValueDone:
-end
-
-_llint_op_get_by_id_proto_custom:
- traceExecution()
- loadisFromInstruction(2, t0)
- loadConstantOrVariableCell(t0, t3, .opGetByIdProtoCustomSlow)
- loadi JSCell::m_structureID[t3], t1
- loadisFromInstruction(4, t2)
- bineq t2, t1, .opGetByIdProtoCustomSlow
- # Setting the topCallFrame
- loadp Callee[cfr], t0
- andp MarkedBlockMask, t0, t1
- loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
- storep cfr, VM::topCallFrame[t1]
- push PC
- push PB
- loadpFromInstruction(3, t0)
- loadIdentifier(t0, a2)
- loadEncodedThisValue(t3, a1)
- loadpFromInstruction(5, t0)
- prepareStateForCCall()
- move cfr, a0
- move a1, a3
- cCall4(t0)
- restoreStateAfterCCall()
- pop PB
- pop PC
- loadisFromInstruction(1, t2)
- storeq r0, [cfr, t2, 8]
- valueProfile(r0, 8, t1)
- dispatch(9)
-
-.opGetByIdProtoCustomSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-
_llint_op_get_array_length:
traceExecution()
loadisFromInstruction(2, t0)
Modified: trunk/Source/_javascript_Core/runtime/Identifier.h (202632 => 202633)
--- trunk/Source/_javascript_Core/runtime/Identifier.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/runtime/Identifier.h 2016-06-29 18:25:40 UTC (rev 202633)
@@ -87,7 +87,6 @@
class Identifier {
friend class Structure;
- friend class LLIntOffsetsExtractor;
public:
Identifier() { }
enum EmptyIdentifierFlag { EmptyIdentifier };
Deleted: trunk/Source/_javascript_Core/tests/stress/llint-get-by-id-proto-accessor.js (202632 => 202633)
--- trunk/Source/_javascript_Core/tests/stress/llint-get-by-id-proto-accessor.js 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/tests/stress/llint-get-by-id-proto-accessor.js 2016-06-29 18:25:40 UTC (rev 202633)
@@ -1,18 +0,0 @@
-foo = {};
-var expected = 6;
-Object.defineProperty(Object.prototype, "bar", { get: () => { return 2 * 3; } });
-
-function test() {
- if (foo.bar != expected) {
- throw new Error();
- }
-}
-
-for (var i = 0; i < 10; i++) {
- if (i == 9) {
- foo = {bar: 7};
- expected = 7;
- }
- test();
-}
-
Deleted: trunk/Source/_javascript_Core/tests/stress/llint-get-by-id-proto-custom.js (202632 => 202633)
--- trunk/Source/_javascript_Core/tests/stress/llint-get-by-id-proto-custom.js 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/_javascript_Core/tests/stress/llint-get-by-id-proto-custom.js 2016-06-29 18:25:40 UTC (rev 202633)
@@ -1,13 +0,0 @@
-var v = Object.create(createCustomGetterObject());
-var expected = v.customGetter;
-
-for (var i = 0; i < 10; i++) {
- if (i == 9) {
- v = {customGetter: 10};
- expected = 10;
- }
- if (v.customGetter != expected) {
- throw Error("");
- }
-}
-