Index: src/full-codegen.h |
=================================================================== |
--- src/full-codegen.h (revision 11348) |
+++ src/full-codegen.h (working copy) |
@@ -83,7 +83,7 @@ |
scope_(info->scope()), |
nesting_stack_(NULL), |
loop_depth_(0), |
- global_count_(0), |
+ globals_(NULL), |
context_(NULL), |
bailout_entries_(info->HasDeoptimizationSupport() |
? info->function()->ast_node_count() : 0), |
@@ -202,7 +202,7 @@ |
virtual ~NestedBlock() {} |
virtual NestedStatement* Exit(int* stack_depth, int* context_length) { |
- if (statement()->AsBlock()->block_scope() != NULL) { |
+ if (statement()->AsBlock()->scope() != NULL) { |
++(*context_length); |
} |
return previous_; |
@@ -413,12 +413,9 @@ |
Label* if_true, |
Label* if_false); |
- // Platform-specific code for a variable, constant, or function |
- // declaration. Functions have an initial value. |
- // Increments global_count_ for unallocated variables. |
- void EmitDeclaration(VariableProxy* proxy, |
- VariableMode mode, |
- FunctionLiteral* function); |
+ // If enabled, emit debug code for checking that the current context is |
+ // neither a with nor a catch context. |
+ void EmitDebugCheckDeclarationContext(Variable* variable); |
// Platform-specific code for checking the stack limit at the back edge of |
// a loop. |
@@ -548,12 +545,8 @@ |
Handle<Script> script() { return info_->script(); } |
bool is_eval() { return info_->is_eval(); } |
bool is_native() { return info_->is_native(); } |
- bool is_classic_mode() { |
- return language_mode() == CLASSIC_MODE; |
- } |
- LanguageMode language_mode() { |
- return function()->language_mode(); |
- } |
+ bool is_classic_mode() { return language_mode() == CLASSIC_MODE; } |
+ LanguageMode language_mode() { return function()->language_mode(); } |
FunctionLiteral* function() { return info_->function(); } |
Scope* scope() { return scope_; } |
@@ -785,7 +778,7 @@ |
Label return_label_; |
NestedStatement* nesting_stack_; |
int loop_depth_; |
- int global_count_; |
+ ZoneList<Handle<Object> >* globals_; |
const ExpressionContext* context_; |
ZoneList<BailoutEntry> bailout_entries_; |
ZoneList<BailoutEntry> stack_checks_; |