check for null context on execution entry

src/api.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/api.h"
 
 #include <string.h>  // For memcpy, strlen.
 #ifdef V8_USE_ADDRESS_SANITIZER
 #include <sanitizer/asan_interface.h>
 #endif  // V8_USE_ADDRESS_SANITIZER
@@ skipping 85 matching lines @@
   EXCEPTION_BAILOUT_CHECK_GENERIC(isolate, value, ;)
 
 
 #define PREPARE_FOR_EXECUTION_GENERIC(context, function_name, bailout_value, \
                                       HandleScopeClass)                      \
   auto isolate = reinterpret_cast<i::Isolate*>(context->GetIsolate());       \
   if (IsExecutionTerminatingCheck(isolate)) {                                \
     return bailout_value;                                                    \
   }                                                                          \
   HandleScopeClass handle_scope(isolate);                                    \
-  CallDepthScope call_depth_scope(isolate, false);                           \
-  v8::Context::Scope context_scope(context);                                 \
+  CallDepthScope call_depth_scope(isolate, context, false);                  \
   LOG_API(isolate, function_name);                                           \
   ENTER_V8(isolate);                                                         \
   bool has_pending_exception = false
 
 
 #define PREPARE_FOR_EXECUTION(context, function_name, T)                 \
   PREPARE_FOR_EXECUTION_GENERIC(context, function_name, MaybeLocal<T>(), \
                                 InternalEscapableScope)
 
 
@@ skipping 35 matching lines @@
 
 class InternalEscapableScope : public v8::EscapableHandleScope {
  public:
   explicit inline InternalEscapableScope(i::Isolate* isolate)
       : v8::EscapableHandleScope(reinterpret_cast<v8::Isolate*>(isolate)) {}
 };
 
 
 class CallDepthScope {
  public:
-  explicit CallDepthScope(i::Isolate* isolate, bool do_callback)
-      : isolate_(isolate), escaped_(false), do_callback_(do_callback) {
+  explicit CallDepthScope(i::Isolate* isolate, Local<Context> context,
+                          bool do_callback)
+      : isolate_(isolate),
+        context_(context),
+        escaped_(false),
+        do_callback_(do_callback) {
+    // TODO(dcarney): remove this when blink stops crashing.
     DCHECK(!isolate_->external_caught_exception());
     isolate_->handle_scope_implementer()->IncrementCallDepth();
+    if (!context_.IsEmpty()) context_->Enter();
   }
   ~CallDepthScope() {
+    if (!context_.IsEmpty()) context_->Exit();
     if (!escaped_) isolate_->handle_scope_implementer()->DecrementCallDepth();
     if (do_callback_) isolate_->FireCallCompletedCallback();
   }
 
   void Escape() {
     DCHECK(!escaped_);
     escaped_ = true;
     auto handle_scope_implementer = isolate_->handle_scope_implementer();
     handle_scope_implementer->DecrementCallDepth();
     bool call_depth_is_zero = handle_scope_implementer->CallDepthIsZero();
     isolate_->OptionalRescheduleException(call_depth_is_zero);
   }
 
  private:
   i::Isolate* const isolate_;
+  Local<Context> context_;
   bool escaped_;
   bool do_callback_;
 };
 
 }  // namespace
 
 
 // --- E x c e p t i o n   B e h a v i o r ---
 
 
@@ skipping 7773 matching lines @@
   Isolate* isolate = reinterpret_cast<Isolate*>(info.GetIsolate());
   Address callback_address =
       reinterpret_cast<Address>(reinterpret_cast<intptr_t>(callback));
   VMState<EXTERNAL> state(isolate);
   ExternalCallbackScope call_scope(isolate, callback_address);
   callback(info);
 }
 
 
 } }  // namespace v8::internal