Chain ScopeInfos together

src/debug/debug-evaluate.cc

 // Copyright 2015 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/debug/debug-evaluate.h"
 
 #include "src/accessors.h"
 #include "src/compiler.h"
 #include "src/contexts.h"
 #include "src/debug/debug-frames.h"
@@ skipping 77 matching lines @@
 
 // Compile and evaluate source for the given context.
 MaybeHandle<Object> DebugEvaluate::Evaluate(
     Isolate* isolate, Handle<SharedFunctionInfo> outer_info,
     Handle<Context> context, Handle<HeapObject> context_extension,
     Handle<Object> receiver, Handle<String> source) {
   if (context_extension->IsJSObject()) {
     Handle<JSObject> extension = Handle<JSObject>::cast(context_extension);
     Handle<JSFunction> closure(context->closure(), isolate);
     context = isolate->factory()->NewWithContext(
-        closure, context, ScopeInfo::CreateForWithScope(isolate), extension);
+        closure, context,
+        ScopeInfo::CreateForWithScope(
+            isolate, context->IsNativeContext()
+                         ? Handle<ScopeInfo>::null()
+                         : Handle<ScopeInfo>(context->scope_info())),
+        extension);
   }
 
   Handle<JSFunction> eval_fun;
   ASSIGN_RETURN_ON_EXCEPTION(
       isolate, eval_fun,
       Compiler::GetFunctionFromEval(source, outer_info, context, SLOPPY,
                                     NO_PARSE_RESTRICTION, kNoSourcePosition,
                                     kNoSourcePosition),
       Object);
 
@@ skipping 89 matching lines @@
         context_chain_element.wrapped_context = it.CurrentContext();
       }
       context_chain_.Add(context_chain_element);
     } else {
       break;
     }
   }
 
   for (int i = context_chain_.length() - 1; i >= 0; i--) {
     evaluation_context_ = factory->NewDebugEvaluateContext(
-        evaluation_context_, ScopeInfo::CreateForWithScope(isolate),
+        evaluation_context_,
+        ScopeInfo::CreateForWithScope(
+            isolate,
+            evaluation_context_->IsNativeContext()
+                ? Handle<ScopeInfo>::null()
+                : Handle<ScopeInfo>(evaluation_context_->scope_info())),
         context_chain_[i].materialized_object,
         context_chain_[i].wrapped_context, context_chain_[i].whitelist);
   }
 }
 
 
 void DebugEvaluate::ContextBuilder::UpdateValues() {
   // TODO(yangguo): remove updating values.
   for (int i = 0; i < context_chain_.length(); i++) {
     ContextChainElement element = context_chain_[i];
@@ skipping 36 matching lines @@
     return;
   } else if (local_function->shared()->scope_info()->HasReceiver() &&
              !frame_->receiver()->IsTheHole(isolate_)) {
     recv = handle(frame_->receiver(), isolate_);
   }
   JSObject::SetOwnPropertyIgnoreAttributes(target, name, recv, NONE).Check();
 }
 
 }  // namespace internal
 }  // namespace v8