1 files changed, 19 insertions, 10 deletions
diff --git a/deps/v8/test/cctest/test-macro-assembler-x64.cc b/deps/v8/test/cctest/test-macro-assembler-x64.cc
index c9f601308f..092d555dbc 100644
--- a/deps/v8/test/cctest/test-macro-assembler-x64.cc
+++ b/deps/v8/test/cctest/test-macro-assembler-x64.cc
@@ -30,9 +30,10 @@
 #include "src/v8.h"
 
 #include "src/base/platform/platform.h"
-#include "src/factory.h"
+#include "src/heap/factory.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
+#include "src/simulator.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
@@ -48,7 +49,7 @@ namespace test_macro_assembler_x64 {
 // This calling convention is used on Linux, with GCC, and on Mac OS,
 // with GCC.  A different convention is used on 64-bit windows.
 
-typedef int (*F0)();
+typedef int(F0)();
 
 #define __ masm->
 
@@ -129,7 +130,8 @@ TEST(SmiMove) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }
 
@@ -221,7 +223,8 @@ TEST(SmiCompare) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }
 
@@ -321,7 +324,8 @@ TEST(Integer32ToSmi) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }
 
@@ -396,7 +400,8 @@ TEST(SmiCheck) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }
 
@@ -450,7 +455,8 @@ TEST(SmiIndex) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }
 
@@ -801,7 +807,8 @@ TEST(OperandOffset) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }
 
@@ -948,7 +955,8 @@ TEST(LoadAndStoreWithRepresentation) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }
 
@@ -1101,7 +1109,8 @@ TEST(SIMDMacros) {
   masm->GetCode(isolate, &desc);
   MakeAssemblerBufferExecutable(buffer, allocated);
   // Call the function from C++.
-  int result = FUNCTION_CAST<F0>(buffer)();
+  auto f = GeneratedCode<F0>::FromAddress(CcTest::i_isolate(), buffer);
+  int result = f.Call();
   CHECK_EQ(0, result);
 }