Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/debug/debug-scopes.cc

Issue 2632123006: Reland: [Parse] ParseInfo owns the parsing Zone. (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/crankshaft/hydrogen.cc ('k') | src/parsing/parse-info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 the V8 project authors. All rights reserved. 1 // Copyright 2015 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/debug/debug-scopes.h" 5 #include "src/debug/debug-scopes.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "src/ast/ast.h" 9 #include "src/ast/ast.h"
10 #include "src/ast/scopes.h" 10 #include "src/ast/scopes.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (scope_info->scope_type() == FUNCTION_SCOPE) { 80 if (scope_info->scope_type() == FUNCTION_SCOPE) {
81 nested_scope_chain_.Add(ExtendedScopeInfo(scope_info, 81 nested_scope_chain_.Add(ExtendedScopeInfo(scope_info,
82 shared_info->start_position(), 82 shared_info->start_position(),
83 shared_info->end_position())); 83 shared_info->end_position()));
84 } 84 }
85 if (!collect_non_locals) return; 85 if (!collect_non_locals) return;
86 } 86 }
87 87
88 // Reparse the code and analyze the scopes. 88 // Reparse the code and analyze the scopes.
89 // Check whether we are in global, eval or function code. 89 // Check whether we are in global, eval or function code.
90 Zone zone(isolate->allocator(), ZONE_NAME);
91 std::unique_ptr<ParseInfo> info; 90 std::unique_ptr<ParseInfo> info;
92 if (scope_info->scope_type() != FUNCTION_SCOPE) { 91 if (scope_info->scope_type() != FUNCTION_SCOPE) {
93 // Global or eval code. 92 // Global or eval code.
94 Handle<Script> script(Script::cast(shared_info->script())); 93 Handle<Script> script(Script::cast(shared_info->script()));
95 info.reset(new ParseInfo(&zone, script)); 94 info.reset(new ParseInfo(script));
96 if (scope_info->scope_type() == EVAL_SCOPE) { 95 if (scope_info->scope_type() == EVAL_SCOPE) {
97 info->set_eval(); 96 info->set_eval();
98 if (!function->context()->IsNativeContext()) { 97 if (!function->context()->IsNativeContext()) {
99 info->set_outer_scope_info(handle(function->context()->scope_info())); 98 info->set_outer_scope_info(handle(function->context()->scope_info()));
100 } 99 }
101 // Language mode may be inherited from the eval caller. 100 // Language mode may be inherited from the eval caller.
102 // Retrieve it from shared function info. 101 // Retrieve it from shared function info.
103 info->set_language_mode(shared_info->language_mode()); 102 info->set_language_mode(shared_info->language_mode());
104 } else if (scope_info->scope_type() == MODULE_SCOPE) { 103 } else if (scope_info->scope_type() == MODULE_SCOPE) {
105 info->set_module(); 104 info->set_module();
106 } else { 105 } else {
107 DCHECK(scope_info->scope_type() == SCRIPT_SCOPE); 106 DCHECK(scope_info->scope_type() == SCRIPT_SCOPE);
108 } 107 }
109 } else { 108 } else {
110 // Inner function. 109 // Inner function.
111 info.reset(new ParseInfo(&zone, shared_info)); 110 info.reset(new ParseInfo(shared_info));
112 } 111 }
113 if (parsing::ParseAny(info.get()) && Rewriter::Rewrite(info.get())) { 112 if (parsing::ParseAny(info.get()) && Rewriter::Rewrite(info.get())) {
114 DeclarationScope* scope = info->literal()->scope(); 113 DeclarationScope* scope = info->literal()->scope();
115 if (!ignore_nested_scopes || collect_non_locals) { 114 if (!ignore_nested_scopes || collect_non_locals) {
116 CollectNonLocals(info.get(), scope); 115 CollectNonLocals(info.get(), scope);
117 } 116 }
118 if (!ignore_nested_scopes) { 117 if (!ignore_nested_scopes) {
119 DeclarationScope::Analyze(info.get(), AnalyzeMode::kDebugger); 118 DeclarationScope::Analyze(info.get(), AnalyzeMode::kDebugger);
120 RetrieveScopeChain(scope); 119 RetrieveScopeChain(scope);
121 } 120 }
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 DCHECK((beg_pos >= 0 && end_pos >= 0) || inner_scope->is_hidden()); 856 DCHECK((beg_pos >= 0 && end_pos >= 0) || inner_scope->is_hidden());
858 if (beg_pos <= position && position < end_pos) { 857 if (beg_pos <= position && position < end_pos) {
859 GetNestedScopeChain(isolate, inner_scope, position); 858 GetNestedScopeChain(isolate, inner_scope, position);
860 return; 859 return;
861 } 860 }
862 } 861 }
863 } 862 }
864 863
865 } // namespace internal 864 } // namespace internal
866 } // namespace v8 865 } // namespace v8
OLDNEW
« no previous file with comments | « src/crankshaft/hydrogen.cc ('k') | src/parsing/parse-info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698