Classes: Implement correct name binding

src/full-codegen.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/ast.h"
 #include "src/ast-numbering.h"
 #include "src/code-factory.h"
 #include "src/codegen.h"
@@ skipping 1587 matching lines @@
     SetStackOverflow();
     return;
   }
   EmitNewClosure(function_info, expr->pretenure());
 }
 
 
 void FullCodeGenerator::VisitClassLiteral(ClassLiteral* lit) {
   Comment cmnt(masm_, "[ ClassLiteral");
 
+  Scope* saved_scope = scope();
+  if (lit->scope() != NULL) {
+    scope_ = lit->scope();
+    DCHECK(scope_->is_block_scope());
+    {
+      Comment cmnt(masm_, "[ Extend block context");

[Dmitry Lomov (no reviews), 2014/11/13 11:17:37]

Please share code with VisitBlock here (add an EnterBlockScope method)

We will also need bailout ids here in the future, when/if we
hydrogenize/turbofanize this. 
I suggest extracting that part too (so both context pushing and visiting
declarations below are part of EnterBlockScope method), parameterizing
EnterBlockScope with BailoutIds and for now passing BailoutId::None here.

[arv (Not doing code reviews), 2014/11/13 20:47:49]

Done.

+      __ Push(scope_->GetScopeInfo());
+      PushFunctionArgumentForContextAllocation();
+      __ CallRuntime(Runtime::kPushBlockContext, 2);
+      StoreToFrameField(StandardFrameConstants::kContextOffset,
+                        context_register());
+    }
+    {
+      Comment cmnt(masm_, "[ Declarations");
+      DCHECK_EQ(1, scope_->declarations()->length());
+      VisitDeclarations(scope_->declarations());
+    }
+  }
+
   if (lit->raw_name() != NULL) {
     __ Push(lit->name());
   } else {
     __ Push(isolate()->factory()->undefined_value());
   }
 
   if (lit->extends() != NULL) {
     VisitForStackValue(lit->extends());
   } else {
     __ Push(isolate()->factory()->the_hole_value());
   }
 
   VisitForStackValue(lit->constructor());
 
   __ Push(script());
   __ Push(Smi::FromInt(lit->start_position()));
   __ Push(Smi::FromInt(lit->end_position()));
 
   __ CallRuntime(Runtime::kDefineClass, 6);
   EmitClassDefineProperties(lit);
 
+  if (lit->scope() != NULL) {
+    DCHECK_NOT_NULL(lit->proxy());
+    EmitVariableAssignment(lit->proxy()->var(), Token::INIT_CONST);
+    LoadContextField(context_register(), Context::PREVIOUS_INDEX);

[Dmitry Lomov (no reviews), 2014/11/13 11:17:37]

Please share code with VisitBlock here (add an ExitBlockScope method)

Same as above for BailoutIds.

[arv (Not doing code reviews), 2014/11/13 20:47:49]

Done.

+    StoreToFrameField(StandardFrameConstants::kContextOffset,
+                      context_register());
+  }
+
+  scope_ = saved_scope;
   context()->Plug(result_register());
 }
 
 
 void FullCodeGenerator::VisitNativeFunctionLiteral(
     NativeFunctionLiteral* expr) {
   Comment cmnt(masm_, "[ NativeFunctionLiteral");
 
   // Compute the function template for the native function.
   Handle<String> name = expr->name();
@@ skipping 150 matching lines @@
   }
   return true;
 }
 #endif  // DEBUG
 
 
 #undef __
 
 
 } }  // namespace v8::internal