A64: Synchronize with r16679.

src/a64/builtins-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 921 matching lines @@
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
     __ CallRuntime(Runtime::kNotifyOSR, 0);
   }
   __ PopXRegList(kSafepointSavedRegisters);
   __ Ret();
 }
 
 
 void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) {
-  // Lookup the function in the JavaScript frame and push it as an
-  // argument to the on-stack replacement function.
+  // Lookup the function in the JavaScript frame.
   __ Ldr(x0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
-    __ Push(x0);
-    __ CallRuntime(Runtime::kCompileForOnStackReplacement, 1);
+    // Lookup and calculate pc offset.
+    __ Ldr(x1, MemOperand(fp, StandardFrameConstants::kCallerPCOffset));
+    __ Ldr(x2, FieldMemOperand(x0, JSFunction::kSharedFunctionInfoOffset));
+    __ Ldr(x2, FieldMemOperand(x2, SharedFunctionInfo::kCodeOffset));
+    __ Sub(x1, x1, Code::kHeaderSize - kHeapObjectTag);
+    __ Sub(x1, x1, x2);
+    __ SmiTag(x1);
+
+    // Pass both function and pc offset as arguments.
+    __ Push(x0, x1);
+    __ CallRuntime(Runtime::kCompileForOnStackReplacement, 2);
   }
 
   // If the code object is null, just return to the unoptimized code.
   Label skip;
   __ CompareAndBranch(x0, Operand(Smi::FromInt(0)), ne, &skip);
   __ Ret();
 
   __ Bind(&skip);
 
   // Load deoptimization data from the code object.
@@ skipping 505 matching lines @@
   __ Bind(&dont_adapt_arguments);
   __ Jump(x3);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM