| Index: src/objects-inl.h
|
| diff --git a/src/objects-inl.h b/src/objects-inl.h
|
| index 812bc184b1d0fc013754c53f96616a455602e464..96f7c3b8be029170bbc29f18d32371ba7859c765 100644
|
| --- a/src/objects-inl.h
|
| +++ b/src/objects-inl.h
|
| @@ -5151,7 +5151,7 @@ ACCESSORS(JSFunction, next_function_link, Object, kNextFunctionLinkOffset)
|
| ACCESSORS(GlobalObject, builtins, JSBuiltinsObject, kBuiltinsOffset)
|
| ACCESSORS(GlobalObject, native_context, Context, kNativeContextOffset)
|
| ACCESSORS(GlobalObject, global_context, Context, kGlobalContextOffset)
|
| -ACCESSORS(GlobalObject, global_receiver, JSObject, kGlobalReceiverOffset)
|
| +ACCESSORS(GlobalObject, global_proxy, JSObject, kGlobalProxyOffset)
|
|
|
| ACCESSORS(JSGlobalProxy, native_context, Object, kNativeContextOffset)
|
| ACCESSORS(JSGlobalProxy, hash, Object, kHashOffset)
|
| @@ -5740,6 +5740,11 @@ Context* JSFunction::context() {
|
| }
|
|
|
|
|
| +JSObject* JSFunction::global_proxy() {
|
| + return context()->global_proxy();
|
| +}
|
| +
|
| +
|
| void JSFunction::set_context(Object* value) {
|
| ASSERT(value->IsUndefined() || value->IsContext());
|
| WRITE_FIELD(this, kContextOffset, value);
|
| @@ -6482,7 +6487,7 @@ PropertyAttributes JSReceiver::GetElementAttribute(Handle<JSReceiver> object,
|
|
|
|
|
| bool JSGlobalObject::IsDetached() {
|
| - return JSGlobalProxy::cast(global_receiver())->IsDetachedFrom(this);
|
| + return JSGlobalProxy::cast(global_proxy())->IsDetachedFrom(this);
|
| }
|
|
|
|
|
|
|