[debugger] allow debug-evaluate to change stack and context values.

src/debug/debug-scopes.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-scopes.h"
 
 #include "src/ast/scopes.h"
 #include "src/debug/debug.h"
 #include "src/frames-inl.h"
 #include "src/globals.h"
@@ skipping 196 matching lines @@
       case FUNCTION_SCOPE:
         DCHECK(context_->IsFunctionContext() || !scope_info->HasContext());
         return ScopeTypeLocal;
       case MODULE_SCOPE:
         DCHECK(context_->IsModuleContext());
         return ScopeTypeModule;
       case SCRIPT_SCOPE:
         DCHECK(context_->IsScriptContext() || context_->IsNativeContext());
         return ScopeTypeScript;
       case WITH_SCOPE:
-        DCHECK(context_->IsWithContext());
+        DCHECK(context_->IsWithContext() || context_->IsDebugEvaluateContext());
         return ScopeTypeWith;
       case CATCH_SCOPE:
         DCHECK(context_->IsCatchContext());
         return ScopeTypeCatch;
       case BLOCK_SCOPE:
         DCHECK(!scope_info->HasContext() || context_->IsBlockContext());
         return ScopeTypeBlock;
       case EVAL_SCOPE:
         UNREACHABLE();
     }
@@ skipping 12 matching lines @@
   }
   if (context_->IsBlockContext()) {
     return ScopeTypeBlock;
   }
   if (context_->IsModuleContext()) {
     return ScopeTypeModule;
   }
   if (context_->IsScriptContext()) {
     return ScopeTypeScript;
   }
-  DCHECK(context_->IsWithContext());
+  DCHECK(context_->IsWithContext() || context_->IsDebugEvaluateContext());
   return ScopeTypeWith;
 }
 
 
 MaybeHandle<JSObject> ScopeIterator::ScopeObject() {
   DCHECK(!failed_);
   switch (Type()) {
     case ScopeIterator::ScopeTypeGlobal:
       return Handle<JSObject>(CurrentContext()->global_proxy());
     case ScopeIterator::ScopeTypeScript:
@@ skipping 76 matching lines @@
   if (Type() == ScopeTypeGlobal || Type() == ScopeTypeScript ||
       nested_scope_chain_.is_empty()) {
     return context_;
   } else if (nested_scope_chain_.last().scope_info->HasContext()) {
     return context_;
   } else {
     return Handle<Context>();
   }
 }
 
-
-void ScopeIterator::GetNonLocals(List<Handle<String> >* list_out) {
+Handle<NameDictionary> ScopeIterator::GetNonLocals() {
   Handle<String> this_string = isolate_->factory()->this_string();
+  Handle<NameDictionary> dict =
+      NameDictionary::New(isolate_, non_locals_->occupancy());
   for (HashMap::Entry* entry = non_locals_->Start(); entry != nullptr;
        entry = non_locals_->Next(entry)) {
     Handle<String> name(reinterpret_cast<String**>(entry->key));
     // We need to treat "this" differently.
     if (name.is_identical_to(this_string)) continue;
-    list_out->Add(Handle<String>(reinterpret_cast<String**>(entry->key)));
+    dict = NameDictionary::Add(dict, name, name, PropertyDetails::Empty());
   }
+  return dict;
 }
 
 
 bool ScopeIterator::ThisIsNonLocal() {
   Handle<String> this_string = isolate_->factory()->this_string();
   void* key = reinterpret_cast<void*>(this_string.location());
   HashMap::Entry* entry = non_locals_->Lookup(key, this_string->Hash());
   return entry != nullptr;
 }
 
@@ skipping 486 matching lines @@
     DCHECK(beg_pos >= 0 && end_pos >= 0);
     if (beg_pos <= position && position < end_pos) {
       GetNestedScopeChain(isolate, inner_scope, position);
       return;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace v8