[interpreter] Refactor iterator access in BytecodeGraphBuilder.

src/compiler/bytecode-graph-builder.h

Index: src/compiler/bytecode-graph-builder.h
diff --git a/src/compiler/bytecode-graph-builder.h b/src/compiler/bytecode-graph-builder.h
index 77053595228fdc3bbf155f9d2e93cc164e002867..9009a5e291358c4e9362fc4d95362b2b20f062e4 100644
--- a/src/compiler/bytecode-graph-builder.h
+++ b/src/compiler/bytecode-graph-builder.h
@@ -125,42 +125,30 @@ class BytecodeGraphBuilder {
                                     interpreter::Register first_arg,
                                     size_t arity);
 
-  void BuildCreateLiteral(const Operator* op,
-                          const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCreateRegExpLiteral(
-      const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCreateArrayLiteral(
-      const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCreateObjectLiteral(
-      const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCreateArguments(CreateArgumentsParameters::Type type,
-                            const interpreter::BytecodeArrayIterator& iterator);
-  void BuildLoadGlobal(const interpreter::BytecodeArrayIterator& iterator,
-                       TypeofMode typeof_mode);
-  void BuildStoreGlobal(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildNamedLoad(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildKeyedLoad(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildNamedStore(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildKeyedStore(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildLdaLookupSlot(TypeofMode typeof_mode,
-                          const interpreter::BytecodeArrayIterator& iterator);
-  void BuildStaLookupSlot(LanguageMode language_mode,
-                          const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCall(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCallJSRuntime(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCallRuntime(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCallRuntimeForPair(
-      const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCallConstruct(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildBinaryOp(const Operator* op,
-                     const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCompareOp(const Operator* op,
-                      const interpreter::BytecodeArrayIterator& iterator);
-  void BuildDelete(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildCastOperator(const Operator* js_op,
-                         const interpreter::BytecodeArrayIterator& iterator);
-  void BuildForInPrepare(const interpreter::BytecodeArrayIterator& iterator);
-  void BuildForInNext(const interpreter::BytecodeArrayIterator& iterator);
+  void BuildCreateLiteral(const Operator* op);
+  void BuildCreateRegExpLiteral();
+  void BuildCreateArrayLiteral();
+  void BuildCreateObjectLiteral();
+  void BuildCreateArguments(CreateArgumentsParameters::Type type);
+  void BuildLoadGlobal(TypeofMode typeof_mode);
+  void BuildStoreGlobal();
+  void BuildNamedLoad();
+  void BuildKeyedLoad();
+  void BuildNamedStore();
+  void BuildKeyedStore();
+  void BuildLdaLookupSlot(TypeofMode typeof_mode);
+  void BuildStaLookupSlot(LanguageMode language_mode);
+  void BuildCall();
+  void BuildCallJSRuntime();
+  void BuildCallRuntime();
+  void BuildCallRuntimeForPair();
+  void BuildCallConstruct();
+  void BuildBinaryOp(const Operator* op);
+  void BuildCompareOp(const Operator* op);
+  void BuildDelete();
+  void BuildCastOperator(const Operator* js_op);
+  void BuildForInPrepare();
+  void BuildForInNext();
 
   // Control flow plumbing.
   void BuildJump(int source_offset, int target_offset);
@@ -217,6 +205,9 @@ class BytecodeGraphBuilder {
     return info()->language_mode();
   }
 
+  const interpreter::BytecodeArrayIterator& iterator() const {

[rmcilroy, 2016/01/28 18:15:04]

Nit - could you call this bytecodes_iterator()

[Michael Starzinger, 2016/01/29 09:42:03]

Done.

+    return *bytecode_iterator_;
+  }
   const interpreter::BytecodeArrayIterator* bytecode_iterator() const {
     return bytecode_iterator_;
   }
@@ -234,8 +225,7 @@ class BytecodeGraphBuilder {
     branch_analysis_ = branch_analysis;
   }
 
-#define DECLARE_VISIT_BYTECODE(name, ...) \
-  void Visit##name(const interpreter::BytecodeArrayIterator& iterator);
+#define DECLARE_VISIT_BYTECODE(name, ...) void Visit##name();
   BYTECODE_LIST(DECLARE_VISIT_BYTECODE)
 #undef DECLARE_VISIT_BYTECODE