Separate CodeAssembler and CodeStubAssembler

src/fast-accessor-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_FAST_ACCESSOR_ASSEMBLER_H_
 #define V8_FAST_ACCESSOR_ASSEMBLER_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "include/v8-experimental.h"
 #include "src/base/macros.h"
 #include "src/base/smart-pointers.h"
 #include "src/handles.h"
 
 // For CodeStubAssembler::Label. (We cannot forward-declare inner classes.)
-#include "src/compiler/code-stub-assembler.h"
+#include "src/code-stub-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 class Code;
 class Isolate;
 class Zone;
 
 namespace compiler {
 class Node;
@@ skipping 38 matching lines @@
   void CheckNotZeroOrJump(ValueId value_id, LabelId label_id);
 
   // C++ callback.
   ValueId Call(FunctionCallback callback, ValueId arg);
 
   // Assemble the code.
   MaybeHandle<Code> Build();
 
  private:
   ValueId FromRaw(compiler::Node* node);
-  LabelId FromRaw(compiler::CodeStubAssembler::Label* label);
+  LabelId FromRaw(CodeStubAssembler::Label* label);
   compiler::Node* FromId(ValueId value) const;
-  compiler::CodeStubAssembler::Label* FromId(LabelId value) const;
+  CodeStubAssembler::Label* FromId(LabelId value) const;
 
   void Clear();
   Zone* zone() { return &zone_; }
   Isolate* isolate() const { return isolate_; }
 
   Zone zone_;
   Isolate* isolate_;
-  base::SmartPointer<compiler::CodeStubAssembler> assembler_;
+  base::SmartPointer<CodeStubAssembler> assembler_;
 
   // To prevent exposing the RMA internals to the outside world, we'll map
   // Node + Label pointers integers wrapped in ValueId and LabelId instances.
   // These vectors maintain this mapping.
   std::vector<compiler::Node*> nodes_;
-  std::vector<compiler::CodeStubAssembler::Label*> labels_;
+  std::vector<CodeStubAssembler::Label*> labels_;
 
   // Remember the current state for easy error checking. (We prefer to be
   // strict as this class will be exposed at the API.)
   enum { kBuilding, kBuilt, kError } state_;
 
   DISALLOW_COPY_AND_ASSIGN(FastAccessorAssembler);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_FAST_ACCESSOR_ASSEMBLER_H_