Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 11013e74ff65b9eb7b153163bb61b71415cecfe3..fe6469b88ecccb7c11136a0667de842ad23731d3 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -1107,17 +1107,17 @@ void LCodeGen::DoCallStub(LCallStub* instr) { |
switch (instr->hydrogen()->major_key()) { |
case CodeStub::RegExpExec: { |
RegExpExecStub stub(isolate()); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
break; |
} |
case CodeStub::SubString: { |
SubStringStub stub(isolate()); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
break; |
} |
case CodeStub::StringCompare: { |
StringCompareStub stub(isolate()); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
break; |
} |
default: |
@@ -2163,7 +2163,7 @@ void LCodeGen::DoArithmeticT(LArithmeticT* instr) { |
// Block literal pool emission to ensure nop indicating no inlined smi code |
// is in the correct position. |
Assembler::BlockConstPoolScope block_const_pool(masm()); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
} |
@@ -2755,7 +2755,7 @@ void LCodeGen::DoInstanceOf(LInstanceOf* instr) { |
ASSERT(ToRegister(instr->right()).is(r1)); // Function is in r1. |
InstanceofStub stub(isolate(), InstanceofStub::kArgsInRegisters); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
__ cmp(r0, Operand::Zero()); |
__ mov(r0, Operand(factory()->false_value()), LeaveCC, ne); |
@@ -2873,7 +2873,7 @@ void LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr, |
ASSERT_EQ(1, masm_->InstructionsGeneratedSince(&before_push_delta)); |
__ nop(); |
} |
- CallCodeGeneric(stub.GetCode(isolate()), |
+ CallCodeGeneric(stub.GetCode(), |
RelocInfo::CODE_TARGET, |
instr, |
RECORD_SAFEPOINT_WITH_REGISTERS_AND_NO_ARGUMENTS); |
@@ -3995,7 +3995,7 @@ void LCodeGen::DoCallFunction(LCallFunction* instr) { |
int arity = instr->arity(); |
CallFunctionStub stub(isolate(), arity, instr->hydrogen()->function_flags()); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
} |
@@ -4008,7 +4008,7 @@ void LCodeGen::DoCallNew(LCallNew* instr) { |
// No cell in r2 for construct type feedback in optimized code |
__ LoadRoot(r2, Heap::kUndefinedValueRootIndex); |
CallConstructStub stub(isolate(), NO_CALL_FUNCTION_FLAGS); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CONSTRUCT_CALL, instr); |
} |
@@ -4027,7 +4027,7 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) { |
if (instr->arity() == 0) { |
ArrayNoArgumentConstructorStub stub(isolate(), kind, override_mode); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CONSTRUCT_CALL, instr); |
} else if (instr->arity() == 1) { |
Label done; |
if (IsFastPackedElementsKind(kind)) { |
@@ -4042,17 +4042,17 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) { |
ArraySingleArgumentConstructorStub stub(isolate(), |
holey_kind, |
override_mode); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CONSTRUCT_CALL, instr); |
__ jmp(&done); |
__ bind(&packed_case); |
} |
ArraySingleArgumentConstructorStub stub(isolate(), kind, override_mode); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CONSTRUCT_CALL, instr); |
__ bind(&done); |
} else { |
ArrayNArgumentsConstructorStub stub(isolate(), kind, override_mode); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CONSTRUCT_CALL, instr); |
} |
} |
@@ -4474,7 +4474,7 @@ void LCodeGen::DoStringAdd(LStringAdd* instr) { |
StringAddStub stub(isolate(), |
instr->hydrogen()->flags(), |
instr->hydrogen()->pretenure_flag()); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
} |
@@ -5454,7 +5454,7 @@ void LCodeGen::DoFunctionLiteral(LFunctionLiteral* instr) { |
instr->hydrogen()->strict_mode(), |
instr->hydrogen()->is_generator()); |
__ mov(r2, Operand(instr->hydrogen()->shared_info())); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); |
} else { |
__ mov(r2, Operand(instr->hydrogen()->shared_info())); |
__ mov(r1, Operand(pretenure ? factory()->true_value() |