Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler

src/code-stubs-hydrogen.cc

 // Copyright 2012 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.
 
 #include "src/code-stubs.h"
 
 #include <memory>
 
 #include "src/bailout-reason.h"
 #include "src/code-factory.h"
@@ skipping 233 matching lines @@
   Handle<Code> new_object = factory->NewCode(
       desc, GetCodeFlags(), masm.CodeObject(), NeedsImmovableCode());
   return new_object;
 }
 
 Handle<Code> HydrogenCodeStub::GenerateRuntimeTailCall(
     CodeStubDescriptor* descriptor) {
   const char* name = CodeStub::MajorName(MajorKey());
   Zone zone(isolate()->allocator(), ZONE_NAME);
   CallInterfaceDescriptor interface_descriptor(GetCallInterfaceDescriptor());
-  compiler::CodeAssemblerState state(isolate(), &zone, interface_descriptor,
-                                     GetCodeFlags(), name);
-  CodeStubAssembler assembler(&state);
+  CodeStubAssembler assembler(isolate(), &zone, interface_descriptor,
+                              GetCodeFlags(), name);
   int total_params = interface_descriptor.GetStackParameterCount() +
                      interface_descriptor.GetRegisterParameterCount();
   switch (total_params) {
     case 0:
       assembler.TailCallRuntime(descriptor->miss_handler_id(),
                                 assembler.Parameter(0));
       break;
     case 1:
       assembler.TailCallRuntime(descriptor->miss_handler_id(),
                                 assembler.Parameter(1), assembler.Parameter(0));
@@ skipping 11 matching lines @@
     case 4:
       assembler.TailCallRuntime(descriptor->miss_handler_id(),
                                 assembler.Parameter(4), assembler.Parameter(0),
                                 assembler.Parameter(1), assembler.Parameter(2),
                                 assembler.Parameter(3));
       break;
     default:
       UNIMPLEMENTED();
       break;
   }
-  return compiler::CodeAssembler::GenerateCode(&state);
+  return assembler.GenerateCode();
 }
 
 template <class Stub>
 static Handle<Code> DoGenerateCode(Stub* stub) {
   Isolate* isolate = stub->isolate();
   CodeStubDescriptor descriptor(stub);
 
   if (FLAG_minimal && descriptor.has_miss_handler()) {
     return stub->GenerateRuntimeTailCall(&descriptor);
   }
@@ skipping 850 matching lines @@
   return BuildUncheckedDictionaryElementLoad(receiver, elements, key, hash);
 }
 
 
 Handle<Code> LoadDictionaryElementStub::GenerateCode() {
   return DoGenerateCode(this);
 }
 
 }  // namespace internal
 }  // namespace v8