Implement loads and calls from 'super'

src/ia32/full-codegen-ia32.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"
 
 #if V8_TARGET_ARCH_IA32
 
 #include "src/code-stubs.h"
 #include "src/codegen.h"
@@ skipping 1259 matching lines @@
   context()->Plug(eax);
 }
 
 
 void FullCodeGenerator::VisitVariableProxy(VariableProxy* expr) {
   Comment cmnt(masm_, "[ VariableProxy");
   EmitVariableLoad(expr);
 }
 
 
+void FullCodeGenerator::VisitSuperReference(SuperReference* expr) {
+  Comment cnmt(masm_, "[ SuperReference ");
+
+  Label super_lookup_failure;
+  __ mov(LoadConvention::ReceiverRegister(),
+         Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
+
+  Handle<Symbol> home_object_symbol(isolate()->heap()->home_object_symbol());
+  __ mov(LoadConvention::NameRegister(), home_object_symbol);
+
+  CallLoadIC(NOT_CONTEXTUAL, expr->HomeObjectFeedbackId());
+
+  __ cmp(eax, isolate()->factory()->undefined_value());
+  __ j(equal, &super_lookup_failure);

[Toon Verwaest, 2014/09/15 11:57:20]

What about

j(not_equal, &done)
push(Immediate(...empty_string()));
CallRuntime(...ThrowReferenceError...);
bind(&done);
mov(eax, ...Map...);
mov(eax, ...Prototype...);
context()->Plug(eax)

[Dmitry Lomov (no reviews), 2014/09/15 12:31:12]

Done.

+  __ mov(eax, FieldOperand(eax, HeapObject::kMapOffset));
+  __ mov(eax, FieldOperand(eax, Map::kPrototypeOffset));
+  Label done;
+  __ jmp(&done);
+  __ bind(&super_lookup_failure);
+  __ push(Immediate(isolate()->factory()->empty_string()));

[arv (Not doing code reviews), 2014/09/15 15:22:57]

Can we do a better error message than an empty string?

+  __ CallRuntime(Runtime::kThrowReferenceError, 1);
+  __ bind(&done);
+  context()->Plug(eax);
+}
+
+
 void FullCodeGenerator::EmitLoadGlobalCheckExtensions(VariableProxy* proxy,
                                                       TypeofState typeof_state,
                                                       Label* slow) {
   Register context = esi;
   Register temp = edx;
 
   Scope* s = scope();
   while (s != NULL) {
     if (s->num_heap_slots() > 0) {
       if (s->calls_sloppy_eval()) {
@@ skipping 898 matching lines @@
 
   __ Allocate(map->instance_size(), eax, ecx, edx, &gc_required, TAG_OBJECT);
   __ jmp(&allocated);
 
   __ bind(&gc_required);
   __ Push(Smi::FromInt(map->instance_size()));
   __ CallRuntime(Runtime::kAllocateInNewSpace, 1);
   __ mov(context_register(),
          Operand(ebp, StandardFrameConstants::kContextOffset));
 
+
   __ bind(&allocated);
   __ mov(ebx, map);
   __ pop(ecx);
   __ mov(edx, isolate()->factory()->ToBoolean(done));
   DCHECK_EQ(map->instance_size(), 5 * kPointerSize);
   __ mov(FieldOperand(eax, HeapObject::kMapOffset), ebx);
   __ mov(FieldOperand(eax, JSObject::kPropertiesOffset),
          isolate()->factory()->empty_fixed_array());
   __ mov(FieldOperand(eax, JSObject::kElementsOffset),
          isolate()->factory()->empty_fixed_array());
   __ mov(FieldOperand(eax, JSGeneratorObject::kResultValuePropertyOffset), ecx);
   __ mov(FieldOperand(eax, JSGeneratorObject::kResultDonePropertyOffset), edx);
 
   // Only the value field needs a write barrier, as the other values are in the
   // root set.
   __ RecordWriteField(eax, JSGeneratorObject::kResultValuePropertyOffset,
                       ecx, edx, kDontSaveFPRegs);
 }
 
 
 void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) {
   SetSourcePosition(prop->position());
   Literal* key = prop->key()->AsLiteral();
   DCHECK(!key->value()->IsSmi());
+
+  if (prop->IsSuperAccess()) {
+    __ push(LoadConvention::ReceiverRegister());
+
+    SuperReference* super_ref = prop->obj()->AsSuperReference();
+    VisitForStackValue(super_ref->this_var());
+    __ push(Immediate(key->value()));
+    __ CallRuntime(Runtime::kLoadFromSuper, 3);
+    return;
+  }
+
   __ mov(LoadConvention::NameRegister(), Immediate(key->value()));
   if (FLAG_vector_ics) {
     __ mov(VectorLoadConvention::SlotRegister(),
            Immediate(Smi::FromInt(prop->PropertyFeedbackSlot())));
     CallLoadIC(NOT_CONTEXTUAL);
   } else {
     CallLoadIC(NOT_CONTEXTUAL, prop->PropertyFeedbackId());
   }
 }
 
 
 void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {
   SetSourcePosition(prop->position());
+
   Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize();
   if (FLAG_vector_ics) {
     __ mov(VectorLoadConvention::SlotRegister(),
            Immediate(Smi::FromInt(prop->PropertyFeedbackSlot())));
     CallIC(ic);
   } else {
     CallIC(ic, prop->PropertyFeedbackId());
   }
 }
 
@@ skipping 309 matching lines @@
       : CallIC::METHOD;
   // Get the target function.
   if (call_type == CallIC::FUNCTION) {
     { StackValueContext context(this);
       EmitVariableLoad(callee->AsVariableProxy());
       PrepareForBailout(callee, NO_REGISTERS);
     }
     // Push undefined as receiver. This is patched in the method prologue if it
     // is a sloppy mode method.
     __ push(Immediate(isolate()->factory()->undefined_value()));
+  } else if (callee->AsProperty()->IsSuperAccess()) {
+    Property* prop = callee->AsProperty();
+    SetSourcePosition(prop->position());
+    Literal* key = prop->key()->AsLiteral();
+    DCHECK(!key->value()->IsSmi());
+    // Load the function from the receiver.
+    SuperReference* super_ref = callee->AsProperty()->obj()->AsSuperReference();
+    VisitForAccumulatorValue(super_ref->this_var());
+    __ push(eax);
+    __ push(Operand(esp, kPointerSize));
+    __ push(eax);
+    __ push(Immediate(key->value()));
+    __ CallRuntime(Runtime::kLoadFromSuper, 3);
+    __ mov(Operand(esp, kPointerSize), eax);
   } else {
     // Load the function from the receiver.
     DCHECK(callee->IsProperty());
     __ mov(LoadConvention::ReceiverRegister(), Operand(esp, 0));
     EmitNamedPropertyLoad(callee->AsProperty());
     PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG);
     // Push the target function under the receiver.
     __ push(Operand(esp, 0));
     __ mov(Operand(esp, kPointerSize), eax);
   }
@@ skipping 11 matching lines @@
   Expression* callee = expr->expression();
 
   // Load the function from the receiver.
   DCHECK(callee->IsProperty());
   __ mov(LoadConvention::ReceiverRegister(), Operand(esp, 0));
   __ mov(LoadConvention::NameRegister(), eax);
   EmitKeyedPropertyLoad(callee->AsProperty());
   PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG);
 
   // Push the target function under the receiver.
-  __ push(Operand(esp, 0));
-  __ mov(Operand(esp, kPointerSize), eax);
+  if (callee->AsProperty()->IsSuperAccess()) {
+    __ mov(Operand(esp, 0), eax);
+    SuperReference* super_ref = callee->AsProperty()->obj()->AsSuperReference();
+    VisitForStackValue(super_ref->this_var());
+  } else {
+    __ push(Operand(esp, 0));
+    __ mov(Operand(esp, kPointerSize), eax);
+  }
 
   EmitCall(expr, CallIC::METHOD);
 }
 
 
 void FullCodeGenerator::EmitCall(Call* expr, CallIC::CallType call_type) {
   // Load the arguments.
   ZoneList<Expression*>* args = expr->arguments();
   int arg_count = args->length();
   { PreservePositionScope scope(masm()->positions_recorder());
@@ skipping 2219 matching lines @@
   DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(),
             Assembler::target_address_at(call_target_address,
                                          unoptimized_code));
   return OSR_AFTER_STACK_CHECK;
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32