| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index 80ede14e221e9bd25793ee3fd7a4e3cab468fd5c..da4f4b95718d1db9607e3f1ac02369d154a8bf82 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -284,10 +284,10 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm,
|
| Register prototype) {
|
| // Load the global or builtins object from the current context.
|
| __ ldr(prototype, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX)));
|
| - // Load the global context from the global or builtins object.
|
| + // Load the native context from the global or builtins object.
|
| __ ldr(prototype,
|
| - FieldMemOperand(prototype, GlobalObject::kGlobalContextOffset));
|
| - // Load the function from the global context.
|
| + FieldMemOperand(prototype, GlobalObject::kNativeContextOffset));
|
| + // Load the function from the native context.
|
| __ ldr(prototype, MemOperand(prototype, Context::SlotOffset(index)));
|
| // Load the initial map. The global functions all have initial maps.
|
| __ ldr(prototype,
|
| @@ -310,7 +310,7 @@ void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype(
|
| __ b(ne, miss);
|
| // Get the global function with the given index.
|
| Handle<JSFunction> function(
|
| - JSFunction::cast(isolate->global_context()->get(index)));
|
| + JSFunction::cast(isolate->native_context()->get(index)));
|
| // Load its initial map. The global functions all have initial maps.
|
| __ Move(prototype, Handle<Map>(function->initial_map()));
|
| // Load the prototype from the initial map.
|
|
|