Fix x64 patching of asllocation stub: the pool pointer must be set-up before patching jump is execu…

runtime/vm/assembler_x64.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/heap.h"
@@ skipping 3117 matching lines @@
 }
 
 
 void Assembler::LeaveStubFrame() {
   // Restore caller's PP register that was pushed in EnterStubFrame.
   movq(PP, Address(RBP, (kSavedCallerPpSlotFromFp * kWordSize)));
   LeaveFrame();
 }
 
 
+void Assembler::SetupPP(Register new_pp, Register temp_pc) {
+  Label next;
+  nop(4);  // Need a fixed size sequence on frame entry.
+  call(&next);
+  Bind(&next);
+
+  const intptr_t object_pool_pc_dist =
+      Instructions::HeaderSize() - Instructions::object_pool_offset() +
+      CodeSize();
+  const intptr_t offset =
+      Assembler::EntryPointToPcMarkerOffset() - CodeSize();
+  popq(temp_pc);
+  if (offset != 0) {
+    addq(temp_pc, Immediate(offset));
+  }
+
+  // Load callee's pool pointer.
+  movq(new_pp, Address(temp_pc, -object_pool_pc_dist - offset));
+}
+
+
 void Assembler::ComputeCounterAddressesForCid(intptr_t cid,
                                               Heap::Space space,
                                               Address* count_address,
                                               Address* size_address) {
   ASSERT(cid < kNumPredefinedCids);
   Register temp_reg = TMP;
   Isolate* isolate = Isolate::Current();
   ClassTable* class_table = isolate->class_table();
   const uword class_heap_stats_table_address =
       class_table->PredefinedClassHeapStatsTableAddress();
@@ skipping 410 matching lines @@
 
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
   return xmm_reg_names[reg];
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64