Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler

src/interpreter/interpreter.cc

Index: src/interpreter/interpreter.cc
diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc
index 9ba1ab8a70d8f34df8a29d265518bed4942e7f3f..81aecafecfdfbba9b465c7f54b6f1b685f6bf5e7 100644
--- a/src/interpreter/interpreter.cc
+++ b/src/interpreter/interpreter.cc
@@ -76,16 +76,10 @@
 #define GENERATE_CODE(Name, ...)                                               \
   {                                                                            \
     if (Bytecodes::BytecodeHasHandler(Bytecode::k##Name, operand_scale)) {     \
-      InterpreterDispatchDescriptor descriptor(isolate_);                      \
-      compiler::CodeAssemblerState state(                                      \
-          isolate_, &zone, descriptor,                                         \
-          Code::ComputeFlags(Code::BYTECODE_HANDLER),                          \
-          Bytecodes::ToString(Bytecode::k##Name),                              \
-          Bytecodes::ReturnCount(Bytecode::k##Name));                          \
-      InterpreterAssembler assembler(&state, Bytecode::k##Name,                \
+      InterpreterAssembler assembler(isolate_, &zone, Bytecode::k##Name,       \
                                      operand_scale);                           \
       Do##Name(&assembler);                                                    \
-      Handle<Code> code = compiler::CodeAssembler::GenerateCode(&state);       \
+      Handle<Code> code = assembler.GenerateCode();                            \
       size_t index = GetDispatchTableIndex(Bytecode::k##Name, operand_scale);  \
       dispatch_table_[index] = code->entry();                                  \
       TraceCodegen(code);                                                      \