From aea89b93d2f04c6225db375c1f5c34a024c7ed6b Mon Sep 17 00:00:00 2001
From: jarin <jarin@chromium.org>
Date: Sun, 8 Nov 2015 22:07:41 -0800
Subject: [PATCH] [deoptimizer] Fixes to printing, remove unused parameters.

Review URL: https://codereview.chromium.org/1425143008

Cr-Commit-Position: refs/heads/master@{#31870}
---
 src/deoptimizer.cc | 29 ++++++++++++-----------------
 src/deoptimizer.h  | 15 +++++----------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index c7290b935e..220442b806 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -760,23 +760,23 @@ void Deoptimizer::DoComputeOutputFrames() {
     int frame_index = static_cast<int>(i);
     switch (translated_state_.frames()[i].kind()) {
       case TranslatedFrame::kFunction:
-        DoComputeJSFrame(nullptr, frame_index);
+        DoComputeJSFrame(frame_index);
         jsframe_count_++;
         break;
       case TranslatedFrame::kArgumentsAdaptor:
-        DoComputeArgumentsAdaptorFrame(nullptr, frame_index);
+        DoComputeArgumentsAdaptorFrame(frame_index);
         break;
       case TranslatedFrame::kConstructStub:
-        DoComputeConstructStubFrame(nullptr, frame_index);
+        DoComputeConstructStubFrame(frame_index);
         break;
       case TranslatedFrame::kGetter:
-        DoComputeAccessorStubFrame(nullptr, frame_index, false);
+        DoComputeAccessorStubFrame(frame_index, false);
         break;
       case TranslatedFrame::kSetter:
-        DoComputeAccessorStubFrame(nullptr, frame_index, true);
+        DoComputeAccessorStubFrame(frame_index, true);
         break;
       case TranslatedFrame::kCompiledStub:
-        DoComputeCompiledStubFrame(nullptr, frame_index);
+        DoComputeCompiledStubFrame(frame_index);
         break;
       case TranslatedFrame::kInvalid:
         FATAL("invalid frame");
@@ -806,8 +806,7 @@ void Deoptimizer::DoComputeOutputFrames() {
 }
 
 
-void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
-                                   int frame_index) {
+void Deoptimizer::DoComputeJSFrame(int frame_index) {
   TranslatedFrame* translated_frame =
       &(translated_state_.frames()[frame_index]);
   TranslatedFrame::iterator value_iterator = translated_frame->begin();
@@ -1023,8 +1022,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
 }
 
 
-void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
-                                                 int frame_index) {
+void Deoptimizer::DoComputeArgumentsAdaptorFrame(int frame_index) {
   TranslatedFrame* translated_frame =
       &(translated_state_.frames()[frame_index]);
   TranslatedFrame::iterator value_iterator = translated_frame->begin();
@@ -1130,8 +1128,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
 }
 
 
-void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
-                                              int frame_index) {
+void Deoptimizer::DoComputeConstructStubFrame(int frame_index) {
   TranslatedFrame* translated_frame =
       &(translated_state_.frames()[frame_index]);
   TranslatedFrame::iterator value_iterator = translated_frame->begin();
@@ -1266,8 +1263,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
 }
 
 
-void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
-                                             int frame_index,
+void Deoptimizer::DoComputeAccessorStubFrame(int frame_index,
                                              bool is_setter_stub_frame) {
   TranslatedFrame* translated_frame =
       &(translated_state_.frames()[frame_index]);
@@ -1392,8 +1388,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
 }
 
 
-void Deoptimizer::DoComputeCompiledStubFrame(TranslationIterator* iterator,
-                                             int frame_index) {
+void Deoptimizer::DoComputeCompiledStubFrame(int frame_index) {
   //
   //               FROM                                  TO
   //    |          ....           |          |          ....           |
@@ -2706,7 +2701,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
         PrintF(trace_file, "  reading input frame %s", name.get());
         int arg_count = shared_info->internal_formal_parameter_count() + 1;
         PrintF(trace_file, " => node=%d, args=%d, height=%d; inputs:\n",
-               arg_count, node_id.ToInt(), height);
+               node_id.ToInt(), arg_count, height);
       }
       return TranslatedFrame::JSFrame(node_id, shared_info, height);
     }
diff --git a/src/deoptimizer.h b/src/deoptimizer.h
index b116ccd54d..e2a7569ed9 100644
--- a/src/deoptimizer.h
+++ b/src/deoptimizer.h
@@ -586,16 +586,11 @@ class Deoptimizer : public Malloced {
   void DeleteFrameDescriptions();
 
   void DoComputeOutputFrames();
-  void DoComputeJSFrame(TranslationIterator* iterator, int frame_index);
-  void DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
-                                      int frame_index);
-  void DoComputeConstructStubFrame(TranslationIterator* iterator,
-                                   int frame_index);
-  void DoComputeAccessorStubFrame(TranslationIterator* iterator,
-                                  int frame_index,
-                                  bool is_setter_stub_frame);
-  void DoComputeCompiledStubFrame(TranslationIterator* iterator,
-                                  int frame_index);
+  void DoComputeJSFrame(int frame_index);
+  void DoComputeArgumentsAdaptorFrame(int frame_index);
+  void DoComputeConstructStubFrame(int frame_index);
+  void DoComputeAccessorStubFrame(int frame_index, bool is_setter_stub_frame);
+  void DoComputeCompiledStubFrame(int frame_index);
 
   void WriteTranslatedValueToOutput(
       TranslatedFrame::iterator* iterator, int* input_index, int frame_index,