A64: Synchronize with r15204.

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 1704 matching lines @@
   __ IncrementCounter(counters->store_normal_hit(), 1, x4, x5);
   __ Ret();
 
   // Cache miss: Jump to runtime.
   __ Bind(&miss);
   __ IncrementCounter(counters->store_normal_miss(), 1, x4, x5);
   GenerateMiss(masm);
 }
 
 
-void StoreIC::GenerateGlobalProxy(MacroAssembler* masm,
+void StoreIC::GenerateRuntimeSetProperty(MacroAssembler* masm,
                                   StrictModeFlag strict_mode) {
-  ASM_LOCATION("StoreIC::GenerateGlobalProxy");
+  ASM_LOCATION("StoreIC::GenerateRuntimeSetProperty");
   // ----------- S t a t e -------------
   //  -- x0    : value
   //  -- x1    : receiver
   //  -- x2    : name
   //  -- lr    : return address
   // -----------------------------------
 
   __ Push(x1, x2, x0);
 
   __ Mov(x11, Operand(Smi::FromInt(NONE)));  // PropertyAttributes
@@ skipping 111 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