| Index: src/ast/scopeinfo.cc | 
| diff --git a/src/ast/scopeinfo.cc b/src/ast/scopeinfo.cc | 
| index 28562df144ea1b2823bbbb684795ffbefa1d7ddb..84493ad07c136c90e5f5aff0f14696115dc53fca 100644 | 
| --- a/src/ast/scopeinfo.cc | 
| +++ b/src/ast/scopeinfo.cc | 
| @@ -53,7 +53,6 @@ Handle<ScopeInfo> ScopeInfo::Create(Isolate* isolate, Zone* zone, | 
|  | 
| // Determine use and location of the function variable if it is present. | 
| VariableAllocationInfo function_name_info; | 
| -  VariableMode function_variable_mode; | 
| if (scope->is_function_scope() && | 
| scope->AsDeclarationScope()->function_var() != nullptr) { | 
| Variable* var = scope->AsDeclarationScope()->function_var(); | 
| @@ -65,10 +64,8 @@ Handle<ScopeInfo> ScopeInfo::Create(Isolate* isolate, Zone* zone, | 
| DCHECK(var->IsStackLocal()); | 
| function_name_info = STACK; | 
| } | 
| -    function_variable_mode = var->mode(); | 
| } else { | 
| function_name_info = NONE; | 
| -    function_variable_mode = VAR; | 
| } | 
| DCHECK(context_global_count == 0 || scope->scope_type() == SCRIPT_SCOPE); | 
|  | 
| @@ -99,7 +96,6 @@ Handle<ScopeInfo> ScopeInfo::Create(Isolate* isolate, Zone* zone, | 
| ReceiverVariableField::encode(receiver_info) | | 
| HasNewTargetField::encode(has_new_target) | | 
| FunctionVariableField::encode(function_name_info) | | 
| -              FunctionVariableMode::encode(function_variable_mode) | | 
| AsmModuleField::encode(scope->asm_module()) | | 
| AsmFunctionField::encode(scope->asm_function()) | | 
| HasSimpleParametersField::encode(has_simple_parameters) | | 
| @@ -218,7 +214,6 @@ Handle<ScopeInfo> ScopeInfo::CreateGlobalThisBinding(Isolate* isolate) { | 
| const bool has_simple_parameters = true; | 
| const VariableAllocationInfo receiver_info = CONTEXT; | 
| const VariableAllocationInfo function_name_info = NONE; | 
| -  const VariableMode function_variable_mode = VAR; | 
| const bool has_function_name = false; | 
| const bool has_receiver = true; | 
| const int parameter_count = 0; | 
| @@ -237,7 +232,6 @@ Handle<ScopeInfo> ScopeInfo::CreateGlobalThisBinding(Isolate* isolate) { | 
| DeclarationScopeField::encode(true) | | 
| ReceiverVariableField::encode(receiver_info) | | 
| FunctionVariableField::encode(function_name_info) | | 
| -              FunctionVariableMode::encode(function_variable_mode) | | 
| AsmModuleField::encode(false) | AsmFunctionField::encode(false) | | 
| HasSimpleParametersField::encode(has_simple_parameters) | | 
| FunctionKindField::encode(FunctionKind::kNormalFunction); | 
| @@ -586,14 +580,11 @@ int ScopeInfo::ReceiverContextSlotIndex() { | 
| return -1; | 
| } | 
|  | 
| - | 
| -int ScopeInfo::FunctionContextSlotIndex(String* name, VariableMode* mode) { | 
| +int ScopeInfo::FunctionContextSlotIndex(String* name) { | 
| DCHECK(name->IsInternalizedString()); | 
| -  DCHECK(mode != NULL); | 
| if (length() > 0) { | 
| if (FunctionVariableField::decode(Flags()) == CONTEXT && | 
| FunctionName() == name) { | 
| -      *mode = FunctionVariableMode::decode(Flags()); | 
| return Smi::cast(get(FunctionNameEntryIndex() + 1))->value(); | 
| } | 
| } | 
|  |