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

runtime/vm/flow_graph_compiler_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"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
@@ skipping 968 matching lines @@
   Register new_pp = kNoRegister;
   Register new_pc = kNoRegister;
   if (CanOptimizeFunction() &&
       function.IsOptimizable() &&
       (!is_optimizing() || may_reoptimize())) {
     StubCode* stub_code = isolate()->stub_code();
     const Register function_reg = RDI;
     new_pp = R13;
     new_pc = R12;
 
-    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(new_pc);
-    if (offset != 0) {
-      __ addq(new_pc, Immediate(offset));
-    }
-
-    // Load callee's pool pointer.
-    __ movq(new_pp, Address(new_pc, -object_pool_pc_dist - offset));
+    __ SetupPP(new_pp, new_pc);
 
     // Load function object using the callee's pool pointer.
     __ LoadObject(function_reg, function, new_pp);
 
     // Patch point is after the eventually inlined function object.
     entry_patch_pc_offset_ = assembler()->CodeSize();
 
     // Reoptimization of an optimized function is triggered by counting in
     // IC stubs, but not at the entry of the function.
     if (!is_optimizing()) {
       __ incl(FieldAddress(function_reg, Function::usage_counter_offset()));
     }
     __ cmpl(
         FieldAddress(function_reg, Function::usage_counter_offset()),
         Immediate(GetOptimizationThreshold()));
     ASSERT(function_reg == RDI);
     __ J(GREATER_EQUAL, &stub_code->OptimizeFunctionLabel(), R13);
   } else if (!flow_graph().IsCompiledForOsr()) {
     // We have to load the PP here too because a load of an external label
     // may be patched at the AddCurrentDescriptor below.
     new_pp = R13;
     new_pc = R12;
 
-    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(new_pc);
-    if (offset != 0) {
-      __ addq(new_pc, Immediate(offset));
-    }
-
-    // Load callee's pool pointer.
-    __ movq(new_pp, Address(new_pc, -object_pool_pc_dist - offset));
+    __ SetupPP(new_pp, new_pc);
 
     entry_patch_pc_offset_ = assembler()->CodeSize();
   }
   __ Comment("Enter frame");
   if (flow_graph().IsCompiledForOsr()) {
     intptr_t extra_slots = StackSize()
         - flow_graph().num_stack_locals()
         - flow_graph().num_copied_params();
     ASSERT(extra_slots >= 0);
     __ EnterOsrFrame(extra_slots * kWordSize, new_pp, new_pc);
@@ skipping 668 matching lines @@
   __ movups(reg, Address(RSP, 0));
   __ AddImmediate(RSP, Immediate(kFpuRegisterSize), PP);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64