diff options
Diffstat (limited to 'deps/v8/src/scopeinfo.cc')
| -rw-r--r-- | deps/v8/src/scopeinfo.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/deps/v8/src/scopeinfo.cc b/deps/v8/src/scopeinfo.cc index f50af304a2..0f36234701 100644 --- a/deps/v8/src/scopeinfo.cc +++ b/deps/v8/src/scopeinfo.cc @@ -53,7 +53,7 @@ Handle<ScopeInfo> ScopeInfo::Create(Scope* scope) { FunctionVariableInfo function_name_info; VariableMode function_variable_mode; if (scope->is_function_scope() && scope->function() != NULL) { - Variable* var = scope->function()->proxy()->var(); + Variable* var = scope->function()->var(); if (!var->is_used()) { function_name_info = UNUSED; } else if (var->IsContextSlot()) { @@ -129,8 +129,8 @@ Handle<ScopeInfo> ScopeInfo::Create(Scope* scope) { // If present, add the function variable name and its index. ASSERT(index == scope_info->FunctionNameEntryIndex()); if (has_function_name) { - int var_index = scope->function()->proxy()->var()->index(); - scope_info->set(index++, *scope->function()->proxy()->name()); + int var_index = scope->function()->var()->index(); + scope_info->set(index++, *scope->function()->name()); scope_info->set(index++, Smi::FromInt(var_index)); ASSERT(function_name_info != STACK || (var_index == scope_info->StackLocalCount() && @@ -142,9 +142,7 @@ Handle<ScopeInfo> ScopeInfo::Create(Scope* scope) { ASSERT(index == scope_info->length()); ASSERT(scope->num_parameters() == scope_info->ParameterCount()); ASSERT(scope->num_stack_slots() == scope_info->StackSlotCount()); - ASSERT(scope->num_heap_slots() == scope_info->ContextLength() || - (scope->num_heap_slots() == kVariablePartIndex && - scope_info->ContextLength() == 0)); + ASSERT(scope->num_heap_slots() == scope_info->ContextLength()); return scope_info; } |