Express LoadIC extra ic state with LoadIC::State

src/arm64/full-codegen-arm64.cc

 // Copyright 2013 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_ARM64
 
 #include "src/code-stubs.h"
 #include "src/codegen.h"
@@ skipping 1383 matching lines @@
     __ Bind(&fast);
   }
 
   __ Ldr(LoadIC::ReceiverRegister(), GlobalObjectMemOperand());
   __ Mov(LoadIC::NameRegister(), Operand(proxy->var()->name()));
   if (FLAG_vector_ics) {
     __ Mov(LoadIC::SlotRegister(),
            Smi::FromInt(proxy->VariableFeedbackSlot()));
   }
 
-  ContextualMode mode = (typeof_state == INSIDE_TYPEOF) ? NOT_CONTEXTUAL
-                                                        : CONTEXTUAL;
-  CallLoadIC(mode);
+  CallLoadIC(typeof_state);
 }
 
 
 MemOperand FullCodeGenerator::ContextSlotOperandCheckExtensions(Variable* var,
                                                                 Label* slow) {
   ASSERT(var->IsContextSlot());
   Register context = cp;
   Register next = x10;
   Register temp = x11;
 
@@ skipping 61 matching lines @@
   // variables.
   switch (var->location()) {
     case Variable::UNALLOCATED: {
       Comment cmnt(masm_, "Global variable");
       __ Ldr(LoadIC::ReceiverRegister(), GlobalObjectMemOperand());
       __ Mov(LoadIC::NameRegister(), Operand(var->name()));
       if (FLAG_vector_ics) {
         __ Mov(LoadIC::SlotRegister(),
                Smi::FromInt(proxy->VariableFeedbackSlot()));
       }
-      CallLoadIC(CONTEXTUAL);
+      CallLoadIC(NOT_INSIDE_TYPEOF);
       context()->Plug(x0);
       break;
     }
 
     case Variable::PARAMETER:
     case Variable::LOCAL:
     case Variable::CONTEXT: {
       Comment cmnt(masm_, var->IsContextSlot()
                               ? "Context variable"
                               : "Stack variable");
@@ skipping 457 matching lines @@
 }
 
 
 void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) {
   SetSourcePosition(prop->position());
   Literal* key = prop->key()->AsLiteral();
   __ Mov(LoadIC::NameRegister(), Operand(key->value()));
   if (FLAG_vector_ics) {
     __ Mov(LoadIC::SlotRegister(),
            Smi::FromInt(prop->PropertyFeedbackSlot()));
-    CallLoadIC(NOT_CONTEXTUAL);
+    CallLoadIC(INSIDE_TYPEOF);
   } else {
-    CallLoadIC(NOT_CONTEXTUAL, prop->PropertyFeedbackId());
+    CallLoadIC(INSIDE_TYPEOF, prop->PropertyFeedbackId());
   }
 }
 
 
 void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {
   SetSourcePosition(prop->position());
   // Call keyed load IC. It has arguments key and receiver in r0 and r1.
   Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize();
   if (FLAG_vector_ics) {
     __ Mov(LoadIC::SlotRegister(),
@@ skipping 1783 matching lines @@
     __ Ldr(LoadIC::ReceiverRegister(),
            FieldMemOperand(x10, GlobalObject::kBuiltinsOffset));
     __ Push(LoadIC::ReceiverRegister());
 
     // Load the function from the receiver.
     Handle<String> name = expr->name();
     __ Mov(LoadIC::NameRegister(), Operand(name));
     if (FLAG_vector_ics) {
       __ Mov(LoadIC::SlotRegister(),
              Smi::FromInt(expr->CallRuntimeFeedbackSlot()));
-      CallLoadIC(NOT_CONTEXTUAL);
+      CallLoadIC(INSIDE_TYPEOF);
     } else {
-      CallLoadIC(NOT_CONTEXTUAL, expr->CallRuntimeFeedbackId());
+      CallLoadIC(INSIDE_TYPEOF, expr->CallRuntimeFeedbackId());
     }
 
     // Push the target function under the receiver.
     __ Pop(x10);
     __ Push(x0, x10);
 
     int arg_count = args->length();
     for (int i = 0; i < arg_count; i++) {
       VisitForStackValue(args->at(i));
     }
@@ skipping 319 matching lines @@
   ASSERT(!context()->IsTest());
   VariableProxy* proxy = expr->AsVariableProxy();
   if (proxy != NULL && proxy->var()->IsUnallocated()) {
     Comment cmnt(masm_, "Global variable");
     __ Ldr(LoadIC::ReceiverRegister(), GlobalObjectMemOperand());
     __ Mov(LoadIC::NameRegister(), Operand(proxy->name()));
     if (FLAG_vector_ics) {
       __ Mov(LoadIC::SlotRegister(),
              Smi::FromInt(proxy->VariableFeedbackSlot()));
     }
-    // Use a regular load, not a contextual load, to avoid a reference
-    // error.
-    CallLoadIC(NOT_CONTEXTUAL);
+    // We don't want a reference error if the load fails on the global object.
+    CallLoadIC();
     PrepareForBailout(expr, TOS_REG);
     context()->Plug(x0);
   } else if (proxy != NULL && proxy->var()->IsLookupSlot()) {
     Label done, slow;
 
     // Generate code for loading from variables potentially shadowed
     // by eval-introduced variables.
     EmitDynamicLookupFastCase(proxy, INSIDE_TYPEOF, &slow, &done);
 
     __ Bind(&slow);
@@ skipping 353 matching lines @@
       // if (!result.done) goto l_try;
       __ Bind(&l_loop);
       __ Move(load_receiver, x0);
 
       __ Push(load_receiver);                               // save result
       __ LoadRoot(load_name, Heap::kdone_stringRootIndex);  // "done"
       if (FLAG_vector_ics) {
         __ Mov(LoadIC::SlotRegister(),
                Smi::FromInt(expr->DoneFeedbackSlot()));
       }
-      CallLoadIC(NOT_CONTEXTUAL);                           // x0=result.done
+      CallLoadIC();                                         // x0=result.done
       // The ToBooleanStub argument (result.done) is in x0.
       Handle<Code> bool_ic = ToBooleanStub::GetUninitialized(isolate());
       CallIC(bool_ic);
       __ Cbz(x0, &l_try);
 
       // result.value
       __ Pop(load_receiver);                                 // result
       __ LoadRoot(load_name, Heap::kvalue_stringRootIndex);  // "value"
       if (FLAG_vector_ics) {
         __ Mov(LoadIC::SlotRegister(),
                Smi::FromInt(expr->ValueFeedbackSlot()));
       }
-      CallLoadIC(NOT_CONTEXTUAL);                            // x0=result.value
+      CallLoadIC();                                          // x0=result.value
       context()->DropAndPlug(2, x0);                         // drop iter and g
       break;
     }
   }
 }
 
 
 void FullCodeGenerator::EmitGeneratorResume(Expression *generator,
     Expression *value,
     JSGeneratorObject::ResumeMode resume_mode) {
@@ skipping 408 matching lines @@
   return previous_;
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM64