A64: Synchronize with r18642.

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 488 matching lines @@
                                      Register function,
                                      Register scratch) {
   ASSERT(!AreAliased(function, scratch));
 
   // Check that the value is a JSFunction.
   __ JumpIfSmi(function, miss);
   __ JumpIfNotObjectType(function, scratch, scratch, JS_FUNCTION_TYPE, miss);
 
   // Invoke the function.
   ParameterCount actual(argc);
-  __ InvokeFunction(
-      function, actual, JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
+  __ InvokeFunction(function, actual, JUMP_FUNCTION, NullCallWrapper());
 }
 
 
 void CallICBase::GenerateNormal(MacroAssembler* masm, int argc) {
   // ----------- S t a t e -------------
   //  -- x2    : name
   //  -- lr    : return address
   // -----------------------------------
   Label miss;
   Register name = x2;
@@ skipping 63 matching lines @@
     __ B(ne, &invoke);
 
     // Patch the receiver on the stack.
     __ Bind(&global);
     __ 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,
-                    actual,
-                    JUMP_FUNCTION,
-                    NullCallWrapper(),
-                    call_kind);
+  __ InvokeFunction(x1, actual, JUMP_FUNCTION, NullCallWrapper());
 }
 
 
 void CallIC::GenerateMegamorphic(MacroAssembler* masm,
                                  int argc,
                                  ExtraICState extra_ic_state) {
   // ----------- S t a t e -------------
   //  -- x2    : name
   //  -- lr    : return address
   // -----------------------------------
@@ skipping 1204 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