[refactoring] Split CodeAssemblerState out of CodeAssembler

test/cctest/compiler/code-assembler-tester.h

Index: test/cctest/compiler/code-assembler-tester.h
diff --git a/test/cctest/compiler/code-assembler-tester.h b/test/cctest/compiler/code-assembler-tester.h
index b0c84ec94a1a49fb72a828e462f69116087beba2..65cc91bc512b251410cbd97c5b6f89ed11606101 100644
--- a/test/cctest/compiler/code-assembler-tester.h
+++ b/test/cctest/compiler/code-assembler-tester.h
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/compiler/code-assembler.h"
 #include "src/handles.h"
 #include "src/interface-descriptors.h"
 #include "src/isolate.h"
@@ -11,51 +12,43 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
-class ZoneHolder {
+class AssemblerTesterData {

[Michael Starzinger, 2016/11/15 11:45:20]

nit: Why not just keep this class named "CodeAssemblerTester". I know the
semantics of this class changed, but I think the name still applies. Also then
the file-name still makes sense.

Also, I like that it is no longer templatized! :)

[Jakob Kummerow, 2016/11/15 13:40:32]

Done.

  public:
-  explicit ZoneHolder(Isolate* isolate)
-      : held_zone_(isolate->allocator(), ZONE_NAME) {}
-  Zone* held_zone() { return &held_zone_; }
-
- private:
-  Zone held_zone_;
-};
-
-// Inherit from ZoneHolder in order to create a zone that can be passed to
-// CodeAssembler base class constructor.
-template <typename CodeAssemblerT>
-class CodeAssemblerTesterImpl : private ZoneHolder, public CodeAssemblerT {
- public:
-  // Test generating code for a stub.
-  CodeAssemblerTesterImpl(Isolate* isolate,
-                          const CallInterfaceDescriptor& descriptor)
-      : ZoneHolder(isolate),
-        CodeAssemblerT(isolate, ZoneHolder::held_zone(), descriptor,
-                       Code::ComputeFlags(Code::STUB), "test"),
-        scope_(isolate) {}
+  // Test generating code for a stub. Assumes VoidDescriptor call interface.
+  explicit AssemblerTesterData(Isolate* isolate)
+      : zone_(isolate->allocator(), ZONE_NAME),
+        scope_(isolate),
+        state_(isolate, &zone_, VoidDescriptor(isolate),
+               Code::ComputeFlags(Code::STUB), "test") {}
 
   // Test generating code for a JS function (e.g. builtins).
-  CodeAssemblerTesterImpl(Isolate* isolate, int parameter_count,
-                          Code::Kind kind = Code::BUILTIN)
-      : ZoneHolder(isolate),
-        CodeAssemblerT(isolate, ZoneHolder::held_zone(), parameter_count,
-                       Code::ComputeFlags(kind), "test"),
-        scope_(isolate) {}
+  AssemblerTesterData(Isolate* isolate, int parameter_count,
+                      Code::Kind kind = Code::BUILTIN)
+      : zone_(isolate->allocator(), ZONE_NAME),
+        scope_(isolate),
+        state_(isolate, &zone_, parameter_count, Code::ComputeFlags(kind),
+               "test") {}
 
   // This constructor is intended to be used for creating code objects with
   // specific flags.
-  CodeAssemblerTesterImpl(Isolate* isolate, Code::Flags flags)
-      : ZoneHolder(isolate),
-        CodeAssemblerT(isolate, ZoneHolder::held_zone(), 0, flags, "test"),
-        scope_(isolate) {}
+  AssemblerTesterData(Isolate* isolate, Code::Flags flags)
+      : zone_(isolate->allocator(), ZONE_NAME),
+        scope_(isolate),
+        state_(isolate, &zone_, 0, flags, "test") {}
+
+  CodeAssemblerState* state() { return &state_; }
+
+  Handle<Code> GenerateCode() { return state_.GenerateCode(); }
 
   Handle<Code> GenerateCodeCloseAndEscape() {
-    return scope_.CloseAndEscape(CodeAssemblerT::GenerateCode());
+    return scope_.CloseAndEscape(state_.GenerateCode());
   }
 
  private:
+  Zone zone_;
   HandleScope scope_;
   LocalContext context_;
+  CodeAssemblerState state_;
 };
 
 }  // namespace compiler