| Index: src/x64/code-stubs-x64.cc
|
| ===================================================================
|
| --- src/x64/code-stubs-x64.cc (revision 7083)
|
| +++ src/x64/code-stubs-x64.cc (working copy)
|
| @@ -2656,7 +2656,7 @@
|
| __ movq(arg2, rbx);
|
|
|
| // Argument 1: Subject string.
|
| -#ifdef WIN64_
|
| +#ifdef _WIN64
|
| __ movq(arg1, rdi);
|
| #else
|
| // Already there in AMD64 calling convention.
|
| @@ -3578,8 +3578,7 @@
|
|
|
| // Set up the roots and smi constant registers.
|
| // Needs to be done before any further smi loads.
|
| - ExternalReference roots_address = ExternalReference::roots_address();
|
| - __ movq(kRootRegister, roots_address);
|
| + __ InitializeRootRegister();
|
| __ InitializeSmiConstantRegister();
|
|
|
| #ifdef ENABLE_LOGGING_AND_PROFILING
|
|
|