Pass the context from which a given receiver is accessed explicitly

src/isolate.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/isolate.h"
 
 #include <stdlib.h>
 
 #include <fstream>  // NOLINT(readability/streams)
 #include <sstream>
@@ skipping 764 matching lines @@
 
 
 bool Isolate::IsInternallyUsedPropertyName(Object* name) {
   if (name->IsSymbol()) {
     return Symbol::cast(name)->is_private();
   }
   return name == heap()->hidden_string();
 }
 
 
-bool Isolate::MayAccess(Handle<JSObject> receiver) {
+bool Isolate::MayAccess(Handle<Context> accessing_context,
+                        Handle<JSObject> receiver) {
   DCHECK(receiver->IsJSGlobalProxy() || receiver->IsAccessCheckNeeded());
 
   // Check for compatibility between the security tokens in the
   // current lexical context and the accessed object.
-  DCHECK(context());
 
   {
     DisallowHeapAllocation no_gc;
     // During bootstrapping, callback functions are not enabled yet.
     if (bootstrapper()->IsActive()) return true;
 
     if (receiver->IsJSGlobalProxy()) {
       Object* receiver_context =
           JSGlobalProxy::cast(*receiver)->native_context();
       if (!receiver_context->IsContext()) return false;
 
       // Get the native context of current top context.
       // avoid using Isolate::native_context() because it uses Handle.
-      Context* native_context = context()->global_object()->native_context();
+      Context* native_context =
+          accessing_context->global_object()->native_context();
       if (receiver_context == native_context) return true;
 
       if (Context::cast(receiver_context)->security_token() ==
           native_context->security_token())
         return true;
     }
   }
 
   HandleScope scope(this);
   Handle<Object> data;
   v8::NamedSecurityCallback callback;
   { DisallowHeapAllocation no_gc;
     AccessCheckInfo* access_check_info = GetAccessCheckInfo(this, receiver);
     if (!access_check_info) return false;
     Object* fun_obj = access_check_info->named_callback();
     callback = v8::ToCData<v8::NamedSecurityCallback>(fun_obj);
     if (!callback) return false;
     data = handle(access_check_info->data(), this);
   }
 
   LOG(this, ApiSecurityCheck());
 
-  // Leaving JavaScript.
-  VMState<EXTERNAL> state(this);
-  Handle<Object> key = factory()->undefined_value();
-  return callback(v8::Utils::ToLocal(receiver), v8::Utils::ToLocal(key),
-                  v8::ACCESS_HAS, v8::Utils::ToLocal(data));
+  {
+    SaveContext save(this);
+    set_context(accessing_context->native_context());
+
+    // Leaving JavaScript.
+    VMState<EXTERNAL> state(this);
+    Handle<Object> key = factory()->undefined_value();
+    return callback(v8::Utils::ToLocal(receiver), v8::Utils::ToLocal(key),
+                    v8::ACCESS_HAS, v8::Utils::ToLocal(data));
+  }
 }
 
 
 const char* const Isolate::kStackOverflowMessage =
   "Uncaught RangeError: Maximum call stack size exceeded";
 
 
 Object* Isolate::StackOverflow() {
   HandleScope scope(this);
   // At this point we cannot create an Error object using its javascript
@@ skipping 1995 matching lines @@
   // Then check whether this scope intercepts.
   if ((flag & intercept_mask_)) {
     intercepted_flags_ |= flag;
     return true;
   }
   return false;
 }
 
 }  // namespace internal
 }  // namespace v8