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

Side by Side Diff: src/scopes.h

Issue 7464030: Fix calculation of 'scope_calls_eval' when 'eval' is within a nested catch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 // Convenience variable. 350 // Convenience variable.
351 Variable* receiver_; 351 Variable* receiver_;
352 // Function variable, if any; function scopes only. 352 // Function variable, if any; function scopes only.
353 Variable* function_; 353 Variable* function_;
354 // Convenience variable; function scopes only. 354 // Convenience variable; function scopes only.
355 Variable* arguments_; 355 Variable* arguments_;
356 356
357 // Illegal redeclaration. 357 // Illegal redeclaration.
358 Expression* illegal_redecl_; 358 Expression* illegal_redecl_;
359 359
360 // Scope-specific information. 360 // Scope-specific information computed during parsing.
361 bool scope_inside_with_; // this scope is inside a 'with' of some outer scope 361 //
362 bool scope_contains_with_; // this scope contains a 'with' statement 362 // This scope is inside a 'with' of some outer scope.
363 bool scope_calls_eval_; // this scope contains an 'eval' call 363 bool scope_inside_with_;
364 bool strict_mode_; // this scope is a strict mode scope 364 // This scope contains a 'with' statement.
365 bool scope_contains_with_;
366 // This scope or a nested catch scope or with scope contain an 'eval' call. At
367 // the 'eval' call site this scope is the declaration scope.
368 bool scope_calls_eval_;
369 // This scope is a strict mode scope.
370 bool strict_mode_;
365 371
366 // Computed via PropagateScopeInfo. 372 // Computed via PropagateScopeInfo.
367 bool outer_scope_calls_eval_; 373 bool outer_scope_calls_eval_;
368 bool outer_scope_calls_non_strict_eval_; 374 bool outer_scope_calls_non_strict_eval_;
369 bool inner_scope_calls_eval_; 375 bool inner_scope_calls_eval_;
370 bool outer_scope_is_eval_scope_; 376 bool outer_scope_is_eval_scope_;
371 bool force_eager_compilation_; 377 bool force_eager_compilation_;
372 378
373 // True if it doesn't need scope resolution (e.g., if the scope was 379 // True if it doesn't need scope resolution (e.g., if the scope was
374 // constructed based on a serialized scope info or a catch context). 380 // constructed based on a serialized scope info or a catch context).
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 } 443 }
438 444
439 void SetDefaults(Type type, 445 void SetDefaults(Type type,
440 Scope* outer_scope, 446 Scope* outer_scope,
441 Handle<SerializedScopeInfo> scope_info); 447 Handle<SerializedScopeInfo> scope_info);
442 }; 448 };
443 449
444 } } // namespace v8::internal 450 } } // namespace v8::internal
445 451
446 #endif // V8_SCOPES_H_ 452 #endif // V8_SCOPES_H_
OLDNEW
« src/parser.cc ('K') | « src/parser.cc ('k') | test/mjsunit/scope-calls-eval.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698