Index: src/debug/debug-scopes.cc |
diff --git a/src/debug/debug-scopes.cc b/src/debug/debug-scopes.cc |
index 123e4cb7d139842c92c03ab72a566e26a664eee2..8ce590e312c9ee123dac928e4aa61d04d57eb2f5 100644 |
--- a/src/debug/debug-scopes.cc |
+++ b/src/debug/debug-scopes.cc |
@@ -115,7 +115,7 @@ ScopeIterator::ScopeIterator(Isolate* isolate, FrameInspector* frame_inspector, |
CollectNonLocals(info.get(), scope); |
} |
if (!ignore_nested_scopes) { |
- scope->AllocateVariables(info.get()); |
+ DeclarationScope::AnalyzeForDebugger(info.get()); |
RetrieveScopeChain(scope); |
} |
} else if (!ignore_nested_scopes) { |
@@ -818,11 +818,10 @@ void ScopeIterator::GetNestedScopeChain(Isolate* isolate, Scope* scope, |
if (scope->is_hidden()) { |
// We need to add this chain element in case the scope has a context |
// associated. We need to keep the scope chain and context chain in sync. |
- nested_scope_chain_.Add(ExtendedScopeInfo(scope->GetScopeInfo(isolate))); |
+ nested_scope_chain_.Add(ExtendedScopeInfo(scope->scope_info())); |
} else { |
- nested_scope_chain_.Add(ExtendedScopeInfo(scope->GetScopeInfo(isolate), |
- scope->start_position(), |
- scope->end_position())); |
+ nested_scope_chain_.Add(ExtendedScopeInfo( |
+ scope->scope_info(), scope->start_position(), scope->end_position())); |
} |
for (Scope* inner_scope = scope->inner_scope(); inner_scope != nullptr; |
inner_scope = inner_scope->sibling()) { |