A64: Synchronize with r18147.

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 413 matching lines @@
   __ SmiUntag(scratch, key);
   return MemOperand(backing_store, scratch, LSL, kPointerSizeLog2);
 }
 
 
 Object* CallIC_Miss(Arguments args);
 
 void CallICBase::GenerateMonomorphicCacheProbe(MacroAssembler* masm,
                                                int argc,
                                                Code::Kind kind,
-                                               Code::ExtraICState extra_state) {
+                                               ExtraICState extra_state) {
   // ----------- S t a t e -------------
   //  -- x1    : receiver
   //  -- x2    : name
   // -----------------------------------
   Register receiver = x1;
   Register name = x2;
 
   Label number, non_number, non_string, boolean, probe, miss;
 
   // Probe the stub cache.
@@ skipping 88 matching lines @@
   GenerateFunctionTailCall(masm, argc, &miss, function, x4);
 
   __ Bind(&miss);
   // Fall-through on miss.
 }
 
 
 void CallICBase::GenerateMiss(MacroAssembler* masm,
                               int argc,
                               IC::UtilityId id,
-                              Code::ExtraICState extra_state) {
+                              ExtraICState extra_state) {
   // ----------- S t a t e -------------
   //  -- x2    : name
   //  -- lr    : return address
   // -----------------------------------
   Isolate* isolate = masm->isolate();
 
   if (id == IC::kCallIC_Miss) {
     __ IncrementCounter(isolate->counters()->call_miss(), 1, x3, x4);
   } else {
     __ IncrementCounter(isolate->counters()->keyed_call_miss(), 1, x3, x4);
@@ skipping 44 matching lines @@
   __ InvokeFunction(x1,
                     actual,
                     JUMP_FUNCTION,
                     NullCallWrapper(),
                     call_kind);
 }
 
 
 void CallIC::GenerateMegamorphic(MacroAssembler* masm,
                                  int argc,
-                                 Code::ExtraICState extra_ic_state) {
+                                 ExtraICState extra_ic_state) {
   // ----------- S t a t e -------------
   //  -- x2    : name
   //  -- lr    : return address
   // -----------------------------------
 
   // Get the receiver of the function from the stack.
   // GenerateMonomorphicCacheProbe expects the receiver to be in x1.
   Register receiver = x1;
   __ Peek(receiver, argc * kXRegSizeInBytes);
 
@@ skipping 118 matching lines @@
   // Live values:
   //  x1: receiver
   //  x2: key
   // These assignments are expected by GenerateMonomorphicCacheProbe.
   __ IncrementCounter(counters->keyed_call_generic_lookup_cache(), 1, x10, x11);
   ASSERT(receiver.Is(x1));
   ASSERT(key.Is(x2));
   GenerateMonomorphicCacheProbe(masm,
                                 argc,
                                 Code::KEYED_CALL_IC,
-                                Code::kNoExtraICState);
+                                kNoExtraICState);
   // Fall through on miss.
 
   __ Bind(&slow_call);
   // This branch is taken if:
   // - the receiver requires boxing or access check,
   // - the key is neither smi nor a unique name,
   // - the value loaded is not a function,
   // - there is hope that the runtime will create a monomorphic call stub
   //   that will get fetched next time.
   __ IncrementCounter(counters->keyed_call_generic_slow(), 1, x10, x11);
@@ skipping 31 matching lines @@
 
 void LoadIC::GenerateMegamorphic(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- x2    : name
   //  -- lr    : return address
   //  -- x0    : receiver
   // -----------------------------------
 
   // Probe the stub cache.
   Code::Flags flags = Code::ComputeFlags(
-      Code::HANDLER, MONOMORPHIC, Code::kNoExtraICState,
+      Code::HANDLER, MONOMORPHIC, kNoExtraICState,
       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 962 matching lines @@
   // function which is requesting this patch operation.
   Address info_address =
       Assembler::return_address_from_call_start(address);
   InlineSmiCheckInfo info(info_address);
 
   // Check and decode the patch information instruction.
   if (!info.HasSmiCheck()) {
     return;
   }
 
-#ifdef DEBUG
   if (FLAG_trace_ic) {
     PrintF("[  Patching ic at %p, marker=%p, SMI check=%p\n",
            address, info_address, reinterpret_cast<void*>(info.SmiCheck()));
   }
-#endif
 
   // Patch and activate code generated by JumpPatchSite::EmitJumpIfNotSmi()
   // and JumpPatchSite::EmitJumpIfSmi().
   // Changing
   //   tb(n)z xzr, #0, <target>
   // to
   //   tb(!n)z test_reg, #0, <target>
   Instruction* to_patch = info.SmiCheck();
   PatchingAssembler patcher(to_patch, 1);
   ASSERT(to_patch->IsTestBranch());
@@ skipping 21 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