Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler

src/compiler/code-assembler.h

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_COMPILER_CODE_ASSEMBLER_H_
 #define V8_COMPILER_CODE_ASSEMBLER_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 12 matching lines @@
 
 class Callable;
 class CallInterfaceDescriptor;
 class Isolate;
 class Factory;
 class Zone;
 
 namespace compiler {
 
 class CallDescriptor;
-class CodeAssemblerState;
 class Node;
 class RawMachineAssembler;
 class RawMachineLabel;
 
 #define CODE_ASSEMBLER_COMPARE_BINARY_OP_LIST(V) \
   V(Float32Equal)                                \
   V(Float32LessThan)                             \
   V(Float32LessThanOrEqual)                      \
   V(Float32GreaterThan)                          \
   V(Float32GreaterThanOrEqual)                   \
@@ skipping 123 matching lines @@
 // V8 components that need to generate low-level code using this interface
 // should include this header--and this header only--from the compiler directory
 // (this is actually enforced). Since all interesting data structures are
 // forward declared, it's not possible for clients to peek inside the compiler
 // internals.
 //
 // In addition to providing isolation between TurboFan and code generation
 // clients, CodeAssembler also provides an abstraction for creating variables
 // and enhanced Label functionality to merge variable values along paths where
 // they have differing values, including loops.
-//
-// The CodeAssembler itself is stateless (and instances are expected to be
-// temporary-scoped and short-lived); all its state is encapsulated into
-// a CodeAssemblerState instance.
 class V8_EXPORT_PRIVATE CodeAssembler {
  public:
-  explicit CodeAssembler(CodeAssemblerState* state) : state_(state) {}
+  // Create with CallStub linkage.
+  // |result_size| specifies the number of results returned by the stub.
+  // TODO(rmcilroy): move result_size to the CallInterfaceDescriptor.
+  CodeAssembler(Isolate* isolate, Zone* zone,
+                const CallInterfaceDescriptor& descriptor, Code::Flags flags,
+                const char* name, size_t result_size = 1);
+
+  // Create with JSCall linkage.
+  CodeAssembler(Isolate* isolate, Zone* zone, int parameter_count,
+                Code::Flags flags, const char* name);
 
   virtual ~CodeAssembler();
 
-  static Handle<Code> GenerateCode(CodeAssemblerState* state);
+  Handle<Code> GenerateCode();
 
   bool Is64() const;
   bool IsFloat64RoundUpSupported() const;
   bool IsFloat64RoundDownSupported() const;
   bool IsFloat64RoundTruncateSupported() const;
 
   class Label;
   class Variable {
    public:
     explicit Variable(CodeAssembler* assembler, MachineRepresentation rep);
     ~Variable();
     void Bind(Node* value);
     Node* value() const;
     MachineRepresentation rep() const;
     bool IsBound() const;
 
    private:
     friend class CodeAssembler;
-    friend class CodeAssemblerState;
     class Impl;
     Impl* impl_;
-    CodeAssemblerState* state_;
+    CodeAssembler* assembler_;
   };
 
   typedef ZoneList<Variable*> VariableList;
 
   // ===========================================================================
   // Base Assembler
   // ===========================================================================
 
   // Constants.
   Node* Int32Constant(int32_t value);
@@ skipping 241 matching lines @@
   Factory* factory() const;
   Isolate* isolate() const;
   Zone* zone() const;
 
  protected:
   // Enables subclasses to perform operations before and after a call.
   virtual void CallPrologue();
   virtual void CallEpilogue();
 
  private:
+  CodeAssembler(Isolate* isolate, Zone* zone, CallDescriptor* call_descriptor,
+                Code::Flags flags, const char* name);
+
   Node* CallN(CallDescriptor* descriptor, Node* code_target, Node** args);
   Node* TailCallN(CallDescriptor* descriptor, Node* code_target, Node** args);
 
-  RawMachineAssembler* raw_assembler() const;
-
-  CodeAssemblerState* state_;
+  std::unique_ptr<RawMachineAssembler> raw_assembler_;
+  Code::Flags flags_;
+  const char* name_;
+  bool code_generated_;
+  ZoneSet<Variable::Impl*> variables_;
 
   DISALLOW_COPY_AND_ASSIGN(CodeAssembler);
 };
 
 class CodeAssembler::Label {
  public:
   enum Type { kDeferred, kNonDeferred };
 
   explicit Label(
       CodeAssembler* assembler,
@@ skipping 11 matching lines @@
   ~Label() {}
 
  private:
   friend class CodeAssembler;
 
   void Bind();
   void MergeVariables();
 
   bool bound_;
   size_t merge_count_;
-  CodeAssemblerState* state_;
+  CodeAssembler* assembler_;
   RawMachineLabel* label_;
   // Map of variables that need to be merged to their phi nodes (or placeholders
   // for those phis).
   std::map<Variable::Impl*, Node*> variable_phis_;
   // Map of variables to the list of value nodes that have been added from each
   // merge path in their order of merging.
   std::map<Variable::Impl*, std::vector<Node*>> variable_merges_;
 };
 
-class V8_EXPORT_PRIVATE CodeAssemblerState {
- public:
-  // Create with CallStub linkage.
-  // |result_size| specifies the number of results returned by the stub.
-  // TODO(rmcilroy): move result_size to the CallInterfaceDescriptor.
-  CodeAssemblerState(Isolate* isolate, Zone* zone,
-                     const CallInterfaceDescriptor& descriptor,
-                     Code::Flags flags, const char* name,
-                     size_t result_size = 1);
-
-  // Create with JSCall linkage.
-  CodeAssemblerState(Isolate* isolate, Zone* zone, int parameter_count,
-                     Code::Flags flags, const char* name);
-
-  ~CodeAssemblerState();
-
- private:
-  friend class CodeAssembler;
-
-  CodeAssemblerState(Isolate* isolate, Zone* zone,
-                     CallDescriptor* call_descriptor, Code::Flags flags,
-                     const char* name);
-
-  std::unique_ptr<RawMachineAssembler> raw_assembler_;
-  Code::Flags flags_;
-  const char* name_;
-  bool code_generated_;
-  ZoneSet<CodeAssembler::Variable::Impl*> variables_;
-
-  DISALLOW_COPY_AND_ASSIGN(CodeAssemblerState);
-};
-
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_CODE_ASSEMBLER_H_