1 files changed, 32 insertions, 167 deletions

diff --git a/deps/v8/test/cctest/compiler/function-tester.h b/deps/v8/test/cctest/compiler/function-tester.h
index c1473ac960..e65fa78c13 100644
--- a/deps/v8/test/cctest/compiler/function-tester.h
+++ b/deps/v8/test/cctest/compiler/function-tester.h
@@ -5,110 +5,45 @@
 #ifndef V8_CCTEST_COMPILER_FUNCTION_TESTER_H_
 #define V8_CCTEST_COMPILER_FUNCTION_TESTER_H_
 
-#include "src/ast/ast-numbering.h"
-#include "src/compiler.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/pipeline.h"
-#include "src/execution.h"
-#include "src/full-codegen/full-codegen.h"
 #include "src/handles.h"
-#include "src/objects-inl.h"
-#include "src/parsing/parse-info.h"
-#include "src/parsing/parser.h"
-#include "src/parsing/rewriter.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
 namespace internal {
+
+class CallInterfaceDescriptor;
+class Isolate;
+
 namespace compiler {
 
+class Graph;
+
 class FunctionTester : public InitializedHandleScope {
  public:
-  explicit FunctionTester(const char* source, uint32_t flags = 0)
-      : isolate(main_isolate()),
-        function((FLAG_allow_natives_syntax = true, NewFunction(source))),
-        flags_(flags) {
-    Compile(function);
-    const uint32_t supported_flags =
-        CompilationInfo::kNativeContextSpecializing |
-        CompilationInfo::kInliningEnabled;
-    CHECK_EQ(0u, flags_ & ~supported_flags);
-  }
+  explicit FunctionTester(const char* source, uint32_t flags = 0);
 
-  FunctionTester(Graph* graph, int param_count)
-      : isolate(main_isolate()),
-        function(NewFunction(BuildFunction(param_count).c_str())),
-        flags_(0) {
-    CompileGraph(graph);
-  }
+  FunctionTester(Graph* graph, int param_count);
 
-  FunctionTester(Handle<Code> code, int param_count)
-      : isolate(main_isolate()),
-        function((FLAG_allow_natives_syntax = true,
-                  NewFunction(BuildFunction(param_count).c_str()))),
-        flags_(0) {
-    Compile(function);
-    function->ReplaceCode(*code);
-  }
+  FunctionTester(Handle<Code> code, int param_count);
 
-  FunctionTester(const CallInterfaceDescriptor& descriptor, Handle<Code> code)
-      : FunctionTester(code, descriptor.GetParameterCount()) {}
+  FunctionTester(const CallInterfaceDescriptor& descriptor, Handle<Code> code);
 
   Isolate* isolate;
   Handle<JSFunction> function;
 
-  MaybeHandle<Object> Call() {
-    return Execution::Call(isolate, function, undefined(), 0, nullptr);
-  }
-
-  MaybeHandle<Object> Call(Handle<Object> a) {
-    Handle<Object> args[] = {a};
-    return Execution::Call(isolate, function, undefined(), 1, args);
-  }
-
-  MaybeHandle<Object> Call(Handle<Object> a, Handle<Object> b) {
-    Handle<Object> args[] = {a, b};
-    return Execution::Call(isolate, function, undefined(), 2, args);
-  }
-
+  MaybeHandle<Object> Call();
+  MaybeHandle<Object> Call(Handle<Object> a);
+  MaybeHandle<Object> Call(Handle<Object> a, Handle<Object> b);
   MaybeHandle<Object> Call(Handle<Object> a, Handle<Object> b,
-                           Handle<Object> c) {
-    Handle<Object> args[] = {a, b, c};
-    return Execution::Call(isolate, function, undefined(), 3, args);
-  }
-
+                           Handle<Object> c);
   MaybeHandle<Object> Call(Handle<Object> a, Handle<Object> b, Handle<Object> c,
-                           Handle<Object> d) {
-    Handle<Object> args[] = {a, b, c, d};
-    return Execution::Call(isolate, function, undefined(), 4, args);
-  }
-
-  void CheckThrows(Handle<Object> a, Handle<Object> b) {
-    TryCatch try_catch(reinterpret_cast<v8::Isolate*>(isolate));
-    MaybeHandle<Object> no_result = Call(a, b);
-    CHECK(isolate->has_pending_exception());
-    CHECK(try_catch.HasCaught());
-    CHECK(no_result.is_null());
-    isolate->OptionalRescheduleException(true);
-  }
+                           Handle<Object> d);
 
+  void CheckThrows(Handle<Object> a, Handle<Object> b);
   v8::Local<v8::Message> CheckThrowsReturnMessage(Handle<Object> a,
-                                                  Handle<Object> b) {
-    TryCatch try_catch(reinterpret_cast<v8::Isolate*>(isolate));
-    MaybeHandle<Object> no_result = Call(a, b);
-    CHECK(isolate->has_pending_exception());
-    CHECK(try_catch.HasCaught());
-    CHECK(no_result.is_null());
-    isolate->OptionalRescheduleException(true);
-    CHECK(!try_catch.Message().IsEmpty());
-    return try_catch.Message();
-  }
-
+                                                  Handle<Object> b);
   void CheckCall(Handle<Object> expected, Handle<Object> a, Handle<Object> b,
-                 Handle<Object> c, Handle<Object> d) {
-    Handle<Object> result = Call(a, b, c, d).ToHandleChecked();
-    CHECK(expected->SameValue(*result));
-  }
+                 Handle<Object> c, Handle<Object> d);
 
   void CheckCall(Handle<Object> expected, Handle<Object> a, Handle<Object> b,
                  Handle<Object> c) {
@@ -158,83 +93,25 @@ class FunctionTester : public InitializedHandleScope {
     CheckCall(false_value(), Val(a), Val(b));
   }
 
-  Handle<JSFunction> NewFunction(const char* source) {
-    return Handle<JSFunction>::cast(v8::Utils::OpenHandle(
-        *v8::Local<v8::Function>::Cast(CompileRun(source))));
-  }
+  Handle<JSFunction> NewFunction(const char* source);
+  Handle<JSObject> NewObject(const char* source);
 
-  Handle<JSObject> NewObject(const char* source) {
-    return Handle<JSObject>::cast(v8::Utils::OpenHandle(
-        *v8::Local<v8::Object>::Cast(CompileRun(source))));
-  }
+  Handle<String> Val(const char* string);
+  Handle<Object> Val(double value);
+  Handle<Object> infinity();
+  Handle<Object> minus_infinity();
+  Handle<Object> nan();
+  Handle<Object> undefined();
+  Handle<Object> null();
+  Handle<Object> true_value();
+  Handle<Object> false_value();
 
-  Handle<String> Val(const char* string) {
-    return isolate->factory()->InternalizeUtf8String(string);
-  }
-
-  Handle<Object> Val(double value) {
-    return isolate->factory()->NewNumber(value);
-  }
-
-  Handle<Object> infinity() { return isolate->factory()->infinity_value(); }
-
-  Handle<Object> minus_infinity() { return Val(-V8_INFINITY); }
-
-  Handle<Object> nan() { return isolate->factory()->nan_value(); }
-
-  Handle<Object> undefined() { return isolate->factory()->undefined_value(); }
-
-  Handle<Object> null() { return isolate->factory()->null_value(); }
-
-  Handle<Object> true_value() { return isolate->factory()->true_value(); }
-
-  Handle<Object> false_value() { return isolate->factory()->false_value(); }
-
-  static Handle<JSFunction> ForMachineGraph(Graph* graph, int param_count) {
-    JSFunction* p = NULL;
-    {  // because of the implicit handle scope of FunctionTester.
-      FunctionTester f(graph, param_count);
-      p = *f.function;
-    }
-    return Handle<JSFunction>(p);  // allocated in outer handle scope.
-  }
+  static Handle<JSFunction> ForMachineGraph(Graph* graph, int param_count);
 
  private:
   uint32_t flags_;
 
-  Handle<JSFunction> Compile(Handle<JSFunction> function) {
-    Zone zone(function->GetIsolate()->allocator());
-    ParseInfo parse_info(&zone, function);
-    CompilationInfo info(&parse_info, function);
-    info.MarkAsDeoptimizationEnabled();
-
-    if (!FLAG_turbo_from_bytecode) {
-      CHECK(Parser::ParseStatic(info.parse_info()));
-    }
-    info.SetOptimizing();
-    if (flags_ & CompilationInfo::kNativeContextSpecializing) {
-      info.MarkAsNativeContextSpecializing();
-    }
-    if (flags_ & CompilationInfo::kInliningEnabled) {
-      info.MarkAsInliningEnabled();
-    }
-    if (FLAG_turbo_from_bytecode) {
-      CHECK(Compiler::EnsureBytecode(&info));
-      info.MarkAsOptimizeFromBytecode();
-    } else {
-      CHECK(Compiler::Analyze(info.parse_info()));
-      CHECK(Compiler::EnsureDeoptimizationSupport(&info));
-    }
-    JSFunction::EnsureLiterals(function);
-
-    Handle<Code> code = Pipeline::GenerateCodeForTesting(&info);
-    CHECK(!code.is_null());
-    info.dependencies()->Commit(code);
-    info.context()->native_context()->AddOptimizedCode(*code);
-    function->ReplaceCode(*code);
-    return function;
-  }
-
+  Handle<JSFunction> Compile(Handle<JSFunction> function);
   std::string BuildFunction(int param_count) {
     std::string function_string = "(function(";
     if (param_count > 0) {
@@ -250,19 +127,7 @@ class FunctionTester : public InitializedHandleScope {
 
   // Compile the given machine graph instead of the source of the function
   // and replace the JSFunction's code with the result.
-  Handle<JSFunction> CompileGraph(Graph* graph) {
-    Zone zone(function->GetIsolate()->allocator());
-    ParseInfo parse_info(&zone, function);
-    CompilationInfo info(&parse_info, function);
-
-    CHECK(Parser::ParseStatic(info.parse_info()));
-    info.SetOptimizing();
-
-    Handle<Code> code = Pipeline::GenerateCodeForTesting(&info, graph);
-    CHECK(!code.is_null());
-    function->ReplaceCode(*code);
-    return function;
-  }
+  Handle<JSFunction> CompileGraph(Graph* graph);
 };
 }  // namespace compiler
 }  // namespace internal