Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler

src/builtins/builtins.cc

Index: src/builtins/builtins.cc
diff --git a/src/builtins/builtins.cc b/src/builtins/builtins.cc
index 5997eb35506054e084c3a8394ea5f79b70aa8852..ec981fe01edba1beea76c7805a86841bf4d8a911 100644
--- a/src/builtins/builtins.cc
+++ b/src/builtins/builtins.cc
@@ -4,7 +4,7 @@
 
 #include "src/builtins/builtins.h"
 #include "src/code-events.h"
-#include "src/compiler/code-assembler.h"
+#include "src/code-stub-assembler.h"
 #include "src/ic/ic-state.h"
 #include "src/interface-descriptors.h"
 #include "src/isolate.h"
@@ -42,7 +42,7 @@
 }
 
 typedef void (*MacroAssemblerGenerator)(MacroAssembler*);
-typedef void (*CodeAssemblerGenerator)(compiler::CodeAssemblerState*);
+typedef void (*CodeAssemblerGenerator)(CodeStubAssembler*);
 
 Code* BuildWithMacroAssembler(Isolate* isolate,
                               MacroAssemblerGenerator generator,
@@ -86,10 +86,9 @@
   Zone zone(isolate->allocator(), ZONE_NAME);
   const int argc_with_recv =
       (argc == SharedFunctionInfo::kDontAdaptArgumentsSentinel) ? 0 : argc + 1;
-  compiler::CodeAssemblerState state(isolate, &zone, argc_with_recv, flags,
-                                     name);
-  generator(&state);
-  Handle<Code> code = compiler::CodeAssembler::GenerateCode(&state);
+  CodeStubAssembler assembler(isolate, &zone, argc_with_recv, flags, name);
+  generator(&assembler);
+  Handle<Code> code = assembler.GenerateCode();
   PostBuildProfileAndTracing(isolate, *code, name);
   return *code;
 }
@@ -106,9 +105,9 @@
   CallInterfaceDescriptor descriptor(isolate, interface_descriptor);
   // Ensure descriptor is already initialized.
   DCHECK_LE(0, descriptor.GetRegisterParameterCount());
-  compiler::CodeAssemblerState state(isolate, &zone, descriptor, flags, name);
-  generator(&state);
-  Handle<Code> code = compiler::CodeAssembler::GenerateCode(&state);
+  CodeStubAssembler assembler(isolate, &zone, descriptor, flags, name);
+  generator(&assembler);
+  Handle<Code> code = assembler.GenerateCode();
   PostBuildProfileAndTracing(isolate, *code, name);
   return *code;
 }