Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index 3a93117e385542c259016c087242a171bed3c289..6c77274fe0e07e8f689fe5a28289476dd2294e97 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -1496,6 +1496,10 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { |
bool skip_init_check; |
if (var->scope()->DeclarationScope() != scope()->DeclarationScope()) { |
skip_init_check = false; |
+ } else if (var->is_this()) { |
+ CHECK((info_->shared_info()->kind() & kSubclassConstructor) != 0); |
+ // TODO(dslomov): implement 'this' hole check elimination. |
+ skip_init_check = false; |
} else { |
// Check that we always have valid source position. |
DCHECK(var->initializer_position() != RelocInfo::kNoPosition); |
@@ -3138,6 +3142,17 @@ void FullCodeGenerator::EmitSuperConstructorCall(Call* expr) { |
EmitLoadSuperConstructor(super_ref); |
__ Push(result_register()); |
+ Variable* this_var = super_ref->this_var()->var(); |
+ |
+ GetVar(rax, this_var); |
+ __ CompareRoot(rax, Heap::kTheHoleValueRootIndex); |
+ Label uninitialized_this; |
+ __ j(equal, &uninitialized_this); |
+ __ Push(this_var->name()); |
+ __ CallRuntime(Runtime::kThrowReferenceError, 1); |
+ __ bind(&uninitialized_this); |
+ |
+ |
// Push the arguments ("left-to-right") on the stack. |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
@@ -3172,8 +3187,7 @@ void FullCodeGenerator::EmitSuperConstructorCall(Call* expr) { |
RecordJSReturnSite(expr); |
- // TODO(dslomov): implement TDZ for `this`. |
- EmitVariableAssignment(super_ref->this_var()->var(), Token::ASSIGN); |
+ EmitVariableAssignment(this_var, Token::INIT_CONST); |
context()->Plug(rax); |
} |