[Isolates] Merge 7051:7083 from bleeding_edge to isolates.

src/x64/deoptimizer-x64.cc

Index: src/x64/deoptimizer-x64.cc
===================================================================
--- src/x64/deoptimizer-x64.cc	(revision 7083)
+++ src/x64/deoptimizer-x64.cc	(working copy)
@@ -643,7 +643,7 @@
   // On windows put the argument on the stack (PrepareCallCFunction have
   // created space for this). On linux pass the argument in r8.
 #ifdef _WIN64
-  __ movq(Operand(rsp, 0 * kPointerSize), arg5);
+  __ movq(Operand(rsp, 4 * kPointerSize), arg5);
 #else
   __ movq(r8, arg5);
 #endif
@@ -752,12 +752,9 @@
 
   // Set up the roots register.
   ExternalReference roots_address = ExternalReference::roots_address();
-  __ movq(r13, roots_address);
+  __ InitializeRootRegister();
+  __ InitializeSmiConstantRegister();
 
-  __ movq(kSmiConstantRegister,
-          reinterpret_cast<uint64_t>(Smi::FromInt(kSmiConstantRegisterValue)),
-          RelocInfo::NONE);
-
   // Return to the continuation point.
   __ ret(0);
 }