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

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

Issue 2392303004: [parser] Remove obsolete ParseInfo::is_global flag. (Closed)
Patch Set: Also renumber flags. Created 4 years, 2 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/compiler.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/scopes.h" 9 #include "src/ast/scopes.h"
10 #include "src/debug/debug.h" 10 #include "src/debug/debug.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
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()); 90 Zone zone(isolate->allocator());
91 std::unique_ptr<ParseInfo> info; 91 std::unique_ptr<ParseInfo> info;
92 if (scope_info->scope_type() != FUNCTION_SCOPE) { 92 if (scope_info->scope_type() != FUNCTION_SCOPE) {
93 // Global or eval code. 93 // Global or eval code.
94 Handle<Script> script(Script::cast(shared_info->script())); 94 Handle<Script> script(Script::cast(shared_info->script()));
95 info.reset(new ParseInfo(&zone, script)); 95 info.reset(new ParseInfo(&zone, script));
96 info->set_toplevel(); 96 info->set_toplevel();
97 if (scope_info->scope_type() == SCRIPT_SCOPE) { 97 if (scope_info->scope_type() == EVAL_SCOPE) {
98 info->set_global();
99 } else {
100 DCHECK(scope_info->scope_type() == EVAL_SCOPE);
101 info->set_eval(); 98 info->set_eval();
102 if (!function->context()->IsNativeContext()) { 99 if (!function->context()->IsNativeContext()) {
103 info->set_outer_scope_info(handle(function->context()->scope_info())); 100 info->set_outer_scope_info(handle(function->context()->scope_info()));
104 } 101 }
105 // Language mode may be inherited from the eval caller. 102 // Language mode may be inherited from the eval caller.
106 // Retrieve it from shared function info. 103 // Retrieve it from shared function info.
107 info->set_language_mode(shared_info->language_mode()); 104 info->set_language_mode(shared_info->language_mode());
105 } else {
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, function)); 110 info.reset(new ParseInfo(&zone, function));
112 } 111 }
113 if (Parser::ParseStatic(info.get()) && Rewriter::Rewrite(info.get())) { 112 if (Parser::ParseStatic(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 }
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 DCHECK((beg_pos >= 0 && end_pos >= 0) || inner_scope->is_hidden()); 832 DCHECK((beg_pos >= 0 && end_pos >= 0) || inner_scope->is_hidden());
834 if (beg_pos <= position && position < end_pos) { 833 if (beg_pos <= position && position < end_pos) {
835 GetNestedScopeChain(isolate, inner_scope, position); 834 GetNestedScopeChain(isolate, inner_scope, position);
836 return; 835 return;
837 } 836 }
838 } 837 }
839 } 838 }
840 839
841 } // namespace internal 840 } // namespace internal
842 } // namespace v8 841 } // namespace v8
OLDNEW
« no previous file with comments | « src/compiler.cc ('k') | src/parsing/parse-info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698