| Index: test/cctest/test-macro-assembler-x64.cc
 | 
| diff --git a/test/cctest/test-macro-assembler-x64.cc b/test/cctest/test-macro-assembler-x64.cc
 | 
| index 05beed1dd1c148e17fef1ee3ce1e2f7a52a62d0b..e72807fd80a582a6dffbc73d2fdce306ed9904f4 100644
 | 
| --- a/test/cctest/test-macro-assembler-x64.cc
 | 
| +++ b/test/cctest/test-macro-assembler-x64.cc
 | 
| @@ -196,7 +196,7 @@ TEST(SmiMove) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -290,7 +290,7 @@ TEST(SmiCompare) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -392,7 +392,7 @@ TEST(Integer32ToSmi) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -461,7 +461,7 @@ TEST(Integer64PlusConstantToSmi) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -634,7 +634,7 @@ TEST(SmiCheck) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -718,7 +718,7 @@ TEST(SmiNeg) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -939,7 +939,7 @@ TEST(SmiAdd) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1156,7 +1156,7 @@ TEST(SmiSub) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1242,7 +1242,7 @@ TEST(SmiMul) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1357,7 +1357,7 @@ TEST(SmiDiv) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1465,7 +1465,7 @@ TEST(SmiMod) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1540,7 +1540,7 @@ TEST(SmiIndex) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1611,7 +1611,7 @@ TEST(SmiSelectNonSmi) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1690,7 +1690,7 @@ TEST(SmiAnd) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1771,7 +1771,7 @@ TEST(SmiOr) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1852,7 +1852,7 @@ TEST(SmiXor) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -1912,7 +1912,7 @@ TEST(SmiNot) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -2005,7 +2005,7 @@ TEST(SmiShiftLeft) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -2109,7 +2109,7 @@ TEST(SmiShiftLogicalRight) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -2176,7 +2176,7 @@ TEST(SmiShiftArithmeticRight) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -2240,7 +2240,7 @@ TEST(PositiveSmiTimesPowerOfTwoToInteger64) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -2594,7 +2594,7 @@ TEST(OperandOffset) {
 | 
|  
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -2742,7 +2742,7 @@ TEST(LoadAndStoreWithRepresentation) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| @@ -2897,7 +2897,7 @@ TEST(SIMDMacros) {
 | 
|    __ ret(0);
 | 
|  
 | 
|    CodeDesc desc;
 | 
| -  masm->GetCode(&desc);
 | 
| +  masm->GetCode(isolate, &desc);
 | 
|    // Call the function from C++.
 | 
|    int result = FUNCTION_CAST<F0>(buffer)();
 | 
|    CHECK_EQ(0, result);
 | 
| 
 |