Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler

src/fast-accessor-assembler.cc

 // 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.
 
 #include "src/fast-accessor-assembler.h"
 
 #include "src/base/logging.h"
 #include "src/code-stub-assembler.h"
 #include "src/code-stubs.h"  // For CallApiCallbackStub.
 #include "src/handles-inl.h"
 #include "src/objects.h"  // For FAA::LoadInternalField impl.
 
+using v8::internal::CodeStubAssembler;
 using v8::internal::compiler::Node;
 
 namespace v8 {
 namespace internal {
 
 FastAccessorAssembler::FastAccessorAssembler(Isolate* isolate)
     : zone_(isolate->allocator(), ZONE_NAME),
       isolate_(isolate),
-      assembler_state_(isolate, zone(), 1, Code::ComputeFlags(Code::STUB),
-                       "FastAccessorAssembler"),
-      assembler_(new CodeStubAssembler(&assembler_state_)),
+      assembler_(new CodeStubAssembler(isolate, zone(), 1,
+                                       Code::ComputeFlags(Code::STUB),
+                                       "FastAccessorAssembler")),
       state_(kBuilding) {}
 
 FastAccessorAssembler::~FastAccessorAssembler() { Clear(); }
 
 FastAccessorAssembler::ValueId FastAccessorAssembler::IntegerConstant(
     int const_value) {
   CHECK_EQ(kBuilding, state_);
   return FromRaw(assembler_->NumberConstant(const_value));
 }
 
@@ skipping 206 matching lines @@
                                                Internals::kJSApiObjectType)),
       FromId(label_id));
 
   // Continue.
   assembler_->Goto(&is_jsobject);
   assembler_->Bind(&is_jsobject);
 }
 
 MaybeHandle<Code> FastAccessorAssembler::Build() {
   CHECK_EQ(kBuilding, state_);
-  Handle<Code> code = compiler::CodeAssembler::GenerateCode(&assembler_state_);
+  Handle<Code> code = assembler_->GenerateCode();
   state_ = !code.is_null() ? kBuilt : kError;
   Clear();
   return code;
 }
 
 FastAccessorAssembler::ValueId FastAccessorAssembler::FromRaw(Node* node) {
   nodes_.push_back(node);
   ValueId value = {nodes_.size() - 1};
   return value;
 }
@@ skipping 20 matching lines @@
 void FastAccessorAssembler::Clear() {
   for (auto label : labels_) {
     delete label;
   }
   nodes_.clear();
   labels_.clear();
 }
 
 }  // namespace internal
 }  // namespace v8