| Index: src/full-codegen/ia32/full-codegen-ia32.cc
|
| diff --git a/src/full-codegen/ia32/full-codegen-ia32.cc b/src/full-codegen/ia32/full-codegen-ia32.cc
|
| index f7538ac1d47deb42762c299e33fc1b458012e22c..b0a715f830a4874c5ab07b64d86d28021f0df5f8 100644
|
| --- a/src/full-codegen/ia32/full-codegen-ia32.cc
|
| +++ b/src/full-codegen/ia32/full-codegen-ia32.cc
|
| @@ -708,7 +708,7 @@ void FullCodeGenerator::VisitVariableDeclaration(
|
| VariableProxy* proxy = declaration->proxy();
|
| VariableMode mode = declaration->mode();
|
| Variable* variable = proxy->var();
|
| - bool hole_init = mode == LET || mode == CONST || mode == CONST_LEGACY;
|
| + bool hole_init = mode == LET || mode == CONST;
|
| switch (variable->location()) {
|
| case VariableLocation::GLOBAL:
|
| case VariableLocation::UNALLOCATED:
|
| @@ -1207,16 +1207,11 @@ void FullCodeGenerator::EmitDynamicLookupFastCase(VariableProxy* proxy,
|
| } else if (var->mode() == DYNAMIC_LOCAL) {
|
| Variable* local = var->local_if_not_shadowed();
|
| __ mov(eax, ContextSlotOperandCheckExtensions(local, slow));
|
| - if (local->mode() == LET || local->mode() == CONST ||
|
| - local->mode() == CONST_LEGACY) {
|
| + if (local->mode() == LET || local->mode() == CONST) {
|
| __ cmp(eax, isolate()->factory()->the_hole_value());
|
| __ j(not_equal, done);
|
| - if (local->mode() == CONST_LEGACY) {
|
| - __ mov(eax, isolate()->factory()->undefined_value());
|
| - } else { // LET || CONST
|
| - __ push(Immediate(var->name()));
|
| - __ CallRuntime(Runtime::kThrowReferenceError);
|
| - }
|
| + __ push(Immediate(var->name()));
|
| + __ CallRuntime(Runtime::kThrowReferenceError);
|
| }
|
| __ jmp(done);
|
| }
|
| @@ -1274,10 +1269,6 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy,
|
| // binding in harmony mode.
|
| __ push(Immediate(var->name()));
|
| __ CallRuntime(Runtime::kThrowReferenceError);
|
| - } else {
|
| - // Uninitialized legacy const bindings are unholed.
|
| - DCHECK(var->mode() == CONST_LEGACY);
|
| - __ mov(eax, isolate()->factory()->undefined_value());
|
| }
|
| __ bind(&done);
|
| context()->Plug(eax);
|
| @@ -2143,8 +2134,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op,
|
| __ bind(&uninitialized_this);
|
| EmitStoreToStackLocalOrContextSlot(var, location);
|
|
|
| - } else if (!var->is_const_mode() ||
|
| - (var->mode() == CONST && op == Token::INIT)) {
|
| + } else if (!var->is_const_mode() || op == Token::INIT) {
|
| if (var->IsLookupSlot()) {
|
| // Assignment to var.
|
| __ Push(Immediate(var->name()));
|
| @@ -2166,25 +2156,6 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op,
|
| EmitStoreToStackLocalOrContextSlot(var, location);
|
| }
|
|
|
| - } else if (var->mode() == CONST_LEGACY && op == Token::INIT) {
|
| - // Const initializers need a write barrier.
|
| - DCHECK(!var->IsParameter()); // No const parameters.
|
| - if (var->IsLookupSlot()) {
|
| - __ push(eax);
|
| - __ push(esi);
|
| - __ push(Immediate(var->name()));
|
| - __ CallRuntime(Runtime::kInitializeLegacyConstLookupSlot);
|
| - } else {
|
| - DCHECK(var->IsStackLocal() || var->IsContextSlot());
|
| - Label skip;
|
| - MemOperand location = VarOperand(var, ecx);
|
| - __ mov(edx, location);
|
| - __ cmp(edx, isolate()->factory()->the_hole_value());
|
| - __ j(not_equal, &skip, Label::kNear);
|
| - EmitStoreToStackLocalOrContextSlot(var, location);
|
| - __ bind(&skip);
|
| - }
|
| -
|
| } else {
|
| DCHECK(var->mode() == CONST_LEGACY && op != Token::INIT);
|
| if (is_strict(language_mode())) {
|
|
|