A64: Synchronize with r18581.

src/a64/ic-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 567 matching lines @@
   if (id == IC::kCallIC_Miss) {
     Label invoke, global;
     __ Peek(x2, argc * kPointerSize);   // receiver
     __ JumpIfSmi(x2, &invoke);
     __ JumpIfObjectType(x2, x3, x3, JS_GLOBAL_OBJECT_TYPE, &global);
     __ Cmp(x3, JS_BUILTINS_OBJECT_TYPE);
     __ B(ne, &invoke);
 
     // Patch the receiver on the stack.
     __ Bind(&global);
-    __ Ldr(x2, FieldMemOperand(x2, GlobalObject::kGlobalReceiverOffset));
+    __ LoadRoot(x2, Heap::kUndefinedValueRootIndex);
     __ Poke(x2, argc * kXRegSizeInBytes);
     __ Bind(&invoke);
   }
 
   // Invoke the function.
   CallKind call_kind = CallICBase::Contextual::decode(extra_state)
       ? CALL_AS_FUNCTION
       : CALL_AS_METHOD;
   ParameterCount actual(argc);
   __ InvokeFunction(x1,
@@ skipping 181 matching lines @@
   Label miss;
   __ JumpIfSmi(name, &miss);
   __ IsObjectNameType(name, x0, &miss);
   CallICBase::GenerateNormal(masm, argc);
 
   __ Bind(&miss);
   GenerateMiss(masm, argc);
 }
 
 
-void LoadIC::GenerateMegamorphic(MacroAssembler* masm) {
+void LoadIC::GenerateMegamorphic(MacroAssembler* masm, ContextualMode mode) {
   // ----------- S t a t e -------------
   //  -- x2    : name
   //  -- lr    : return address
   //  -- x0    : receiver
   // -----------------------------------
 
   // Probe the stub cache.
+  ExtraICState extra_ic_state = IC::ComputeExtraICState(mode);
   Code::Flags flags = Code::ComputeFlags(
-      Code::HANDLER, MONOMORPHIC, kNoExtraICState,
+      Code::HANDLER, MONOMORPHIC, extra_ic_state,
       Code::NORMAL, Code::LOAD_IC);
   masm->isolate()->stub_cache()->GenerateProbe(
       masm, flags, x0, x2, x3, x4, x5, x6);
 
   // Cache miss: Jump to runtime.
   GenerateMiss(masm);
 }
 
 
 void LoadIC::GenerateNormal(MacroAssembler* masm) {
@@ skipping 1006 matching lines @@
     ASSERT(to_patch->Mask(TestBranchMask) == TBNZ);
     // This is JumpIfSmi(smi_reg, branch_imm).
     patcher.tbz(smi_reg, 0, branch_imm);
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64