Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index e7b563cffbeefb4525c40d8fa17bd9e3444cb111..54429a1245716a17b23545fe81a6351a77b95ffe 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -4494,11 +4494,11 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// r3: argc |
// r4: argv |
if (is_construct) { |
- ExternalReference construct_entry(Builtins::JSConstructEntryTrampoline, |
+ ExternalReference construct_entry(Builtins::kJSConstructEntryTrampoline, |
isolate); |
__ mov(ip, Operand(construct_entry)); |
} else { |
- ExternalReference entry(Builtins::JSEntryTrampoline, isolate); |
+ ExternalReference entry(Builtins::kJSEntryTrampoline, isolate); |
__ mov(ip, Operand(entry)); |
} |
__ ldr(ip, MemOperand(ip)); // deref address |
@@ -5397,8 +5397,7 @@ void CallFunctionStub::Generate(MacroAssembler* masm) { |
__ mov(r0, Operand(argc_)); // Setup the number of arguments. |
__ mov(r2, Operand(0, RelocInfo::NONE)); |
__ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION); |
- __ Jump(Handle<Code>(Isolate::Current()->builtins()->builtin( |
- Builtins::ArgumentsAdaptorTrampoline)), |
+ __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(), |
RelocInfo::CODE_TARGET); |
} |