Revert of [Interpreter] Optimize BytecodeArrayBuilder and BytecodeArrayWriter.

src/interpreter/bytecode-register-optimizer.h

 // Copyright 2016 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_INTERPRETER_BYTECODE_REGISTER_OPTIMIZER_H_
 #define V8_INTERPRETER_BYTECODE_REGISTER_OPTIMIZER_H_
 
 #include "src/interpreter/bytecode-pipeline.h"
 
 namespace v8 {
@@ skipping 13 matching lines @@
                             int parameter_count,
                             BytecodePipelineStage* next_stage);
   virtual ~BytecodeRegisterOptimizer() {}
 
   // BytecodePipelineStage interface.
   void Write(BytecodeNode* node) override;
   void WriteJump(BytecodeNode* node, BytecodeLabel* label) override;
   void BindLabel(BytecodeLabel* label) override;
   void BindLabel(const BytecodeLabel& target, BytecodeLabel* label) override;
   Handle<BytecodeArray> ToBytecodeArray(
-      Isolate* isolate, int register_count, int parameter_count,
+      Isolate* isolate, int fixed_register_count, int parameter_count,
       Handle<FixedArray> handler_table) override;
 
  private:
   static const uint32_t kInvalidEquivalenceId = kMaxUInt32;
 
   class RegisterInfo;
 
   // TemporaryRegisterObserver interface.
   void TemporaryRegisterFreeEvent(Register reg) override;
 
   // Helpers for BytecodePipelineStage interface.
   void FlushState();
+  void WriteToNextStage(BytecodeNode* node) const;
+  void WriteToNextStage(BytecodeNode* node,
+                        const BytecodeSourceInfo& output_info) const;
 
   // Update internal state for register transfer from |input| to
   // |output| using |source_info| as source position information if
   // any bytecodes are emitted due to transfer.
   void RegisterTransfer(RegisterInfo* input, RegisterInfo* output,
-                        BytecodeSourceInfo* source_info);
+                        const BytecodeSourceInfo& source_info);
 
   // Emit a register transfer bytecode from |input| to |output|.
-  void OutputRegisterTransfer(RegisterInfo* input, RegisterInfo* output,
-                              BytecodeSourceInfo* source_info = nullptr);
+  void OutputRegisterTransfer(
+      RegisterInfo* input, RegisterInfo* output,
+      const BytecodeSourceInfo& source_info = BytecodeSourceInfo());
 
   // Emits a Nop to preserve source position information in the
   // bytecode pipeline.
-  void EmitNopForSourceInfo(BytecodeSourceInfo* source_info) const;
+  void EmitNopForSourceInfo(const BytecodeSourceInfo& source_info) const;
 
   // Handlers for bytecode nodes for register to register transfers.
-  void DoLdar(BytecodeNode* node);
-  void DoMov(BytecodeNode* node);
-  void DoStar(BytecodeNode* node);
+  void DoLdar(const BytecodeNode* const node);
+  void DoMov(const BytecodeNode* const node);
+  void DoStar(const BytecodeNode* const node);
 
   // Operand processing methods for bytecodes other than those
   // performing register to register transfers.
   void PrepareOperands(BytecodeNode* const node);
   void PrepareAccumulator(BytecodeNode* const node);
   void PrepareRegisterOperands(BytecodeNode* const node);
 
   void PrepareRegisterOutputOperand(RegisterInfo* reg_info);
   void PrepareRegisterRangeOutputOperand(Register start, int count);
   void PrepareRegisterInputOperand(BytecodeNode* const node, Register reg,
@@ skipping 46 matching lines @@
     equivalence_id_++;
     CHECK_NE(equivalence_id_, kInvalidEquivalenceId);
     return equivalence_id_;
   }
 
   Zone* zone() { return zone_; }
 
   const Register accumulator_;
   RegisterInfo* accumulator_info_;
   const Register temporary_base_;
-  int max_register_index_;
 
   // Direct mapping to register info.
   ZoneVector<RegisterInfo*> register_info_table_;
   int register_info_table_offset_;
 
   // Counter for equivalence sets identifiers.
   int equivalence_id_;
 
   BytecodePipelineStage* next_stage_;
   bool flush_required_;
   Zone* zone_;
 
   DISALLOW_COPY_AND_ASSIGN(BytecodeRegisterOptimizer);
 };
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_INTERPRETER_BYTECODE_REGISTER_OPTIMIZER_H_