Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 6796f7388abaca9aeff73b3b86b2ed89e4ff7437..c1a3881c3e21faf795134bb236bd2a44c7255426 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -425,7 +425,8 @@ void MacroAssembler::LoadRoot(Register destination, |
if (CpuFeatures::IsSupported(MOVW_MOVT_IMMEDIATE_LOADS) && |
!Heap::RootCanBeWrittenAfterInitialization(index) && |
!predictable_code_size()) { |
- Handle<Object> root(isolate()->heap()->roots_array_start()[index]); |
+ Handle<Object> root(isolate()->heap()->roots_array_start()[index], |
+ isolate()); |
if (!isolate()->heap()->InNewSpace(*root)) { |
// The CPU supports fast immediate values, and this root will never |
// change. We will load it as a relocatable immediate value. |
@@ -2241,13 +2242,13 @@ static int AddressOffset(ExternalReference ref0, ExternalReference ref1) { |
void MacroAssembler::CallApiFunctionAndReturn(ExternalReference function, |
int stack_space) { |
ExternalReference next_address = |
- ExternalReference::handle_scope_next_address(); |
+ ExternalReference::handle_scope_next_address(isolate()); |
const int kNextOffset = 0; |
const int kLimitOffset = AddressOffset( |
- ExternalReference::handle_scope_limit_address(), |
+ ExternalReference::handle_scope_limit_address(isolate()), |
next_address); |
const int kLevelOffset = AddressOffset( |
- ExternalReference::handle_scope_level_address(), |
+ ExternalReference::handle_scope_level_address(isolate()), |
next_address); |
// Allocate HandleScope in callee-save registers. |