Revert "Remove push arguments and replace constants in FlowGraph::InlineCall."

runtime/vm/flow_graph_inliner.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_inliner.h"
 
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 228 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(CallSites);
 };
 
 
 class CallSiteInliner : public ValueObject {
  public:
   explicit CallSiteInliner(FlowGraph* flow_graph)
       : caller_graph_(flow_graph),
         next_ssa_temp_index_(flow_graph->max_virtual_register_number()),
+        inlined_(false),
         initial_size_(flow_graph->InstructionCount()),
         inlined_size_(0),
         inlining_depth_(1),
         collected_call_sites_(NULL),
         inlining_call_sites_(NULL),
         function_cache_() { }
 
   // Inlining heuristics based on Cooper et al. 2008.
   bool ShouldWeInline(intptr_t loop_depth,
                       intptr_t instr_count,
@@ skipping 38 matching lines @@
       InlineStaticCalls();
       InlineClosureCalls();
       InlineInstanceCalls();
       // Increment the inlining depth. Checked before recursive inlining.
       ++inlining_depth_;
     }
     collected_call_sites_ = NULL;
     inlining_call_sites_ = NULL;
   }
 
-  intptr_t inlined_instructions() const { return inlined_size_; }
+  bool inlined() const { return inlined_; }
+
+  double GrowthFactor() const {
+    return static_cast<double>(inlined_size_) /
+        static_cast<double>(initial_size_);
+  }
 
  private:
   bool TryInlining(const Function& function,
                    const Array& argument_names,
                    GrowableArray<Value*>* arguments,
                    Definition* call) {
     TRACE_INLINING(OS::Print("  => %s (deopt count %d)\n",
                              function.ToCString(),
                              function.deoptimization_counter()));
 
@@ skipping 172 matching lines @@
 
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphinliner_subst_timer,
                          isolate);
 
         // Plug result in the caller graph.
         caller_graph_->InlineCall(call, callee_graph);
         next_ssa_temp_index_ = caller_graph_->max_virtual_register_number();
 
+        // Remove push arguments of the call.
+        for (intptr_t i = 0; i < call->ArgumentCount(); ++i) {
+          PushArgumentInstr* push = call->ArgumentAt(i);
+          push->ReplaceUsesWith(push->value()->definition());
+          push->RemoveFromGraph();
+        }
+
         // Replace each stub with the actual argument or the caller's constant.
         // Nulls denote optional parameters for which no actual was given.
         for (intptr_t i = 0; i < arguments->length(); ++i) {
           Definition* stub = param_stubs[i];
           Value* actual = (*arguments)[i];
           if (actual != NULL) stub->ReplaceUsesWith(actual->definition());
         }
+
+        // Replace remaining constants with uses by constants in the caller's
+        // initial definitions.
+        GrowableArray<Definition*>* defns =
+            callee_graph->graph_entry()->initial_definitions();
+        for (intptr_t i = 0; i < defns->length(); ++i) {
+          ConstantInstr* constant = (*defns)[i]->AsConstant();
+          if (constant == NULL ||
+              ((constant->input_use_list() == NULL) &&
+               (constant->env_use_list() == NULL))) {
+            continue;
+          }
+          constant->ReplaceUsesWith(
+            caller_graph_->AddConstantToInitialDefinitions(constant->value()));
+        }
       }
 
-      TRACE_INLINING(OS::Print(
-          "     Success (inlined %"Pd" instructions)\n", size));
+      TRACE_INLINING(OS::Print("     Success\n"));
 
       // Add the function to the cache.
       if (!in_cache) function_cache_.Add(parsed_function);
 
       // Check that inlining maintains use lists.
       DEBUG_ASSERT(!FLAG_verify_compiler || caller_graph_->ValidateUseLists());
 
       // Build succeeded so we restore the bailout jump.
+      inlined_ = true;
       inlined_size_ += size;
       isolate->set_long_jump_base(base);
       isolate->set_deopt_id(prev_deopt_id);
       isolate->set_ic_data_array(prev_ic_data.raw());
       return true;
     } else {
       Error& error = Error::Handle();
       error = isolate->object_store()->sticky_error();
       isolate->object_store()->clear_sticky_error();
       isolate->set_long_jump_base(base);
@@ skipping 175 matching lines @@
       } else {
         param_stubs->Add(
             GetDefaultValue(i - fixed_param_count, parsed_function));
       }
     }
   }
 
 
   FlowGraph* caller_graph_;
   intptr_t next_ssa_temp_index_;
+  bool inlined_;
   intptr_t initial_size_;
   intptr_t inlined_size_;
   intptr_t inlining_depth_;
   CallSites* collected_call_sites_;
   CallSites* inlining_call_sites_;
   GrowableArray<ParsedFunction*> function_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(CallSiteInliner);
 };
 
@@ skipping 13 matching lines @@
   if (FLAG_trace_inlining && FLAG_print_flow_graph) {
     OS::Print("Before Inlining of %s\n", flow_graph_->
               parsed_function().function().ToFullyQualifiedCString());
     FlowGraphPrinter printer(*flow_graph_);
     printer.PrintBlocks();
   }
 
   CallSiteInliner inliner(flow_graph_);
   inliner.InlineCalls();
 
-  if (inliner.inlined_instructions() > 0) {
+  if (inliner.inlined()) {
     flow_graph_->RepairGraphAfterInlining();
     if (FLAG_trace_inlining) {
-      OS::Print("Inlined %"Pd" instructions\n", inliner.inlined_instructions());
+      OS::Print("Inlining growth factor: %f\n", inliner.GrowthFactor());
       if (FLAG_print_flow_graph) {
         OS::Print("After Inlining of %s\n", flow_graph_->
                   parsed_function().function().ToFullyQualifiedCString());
         FlowGraphPrinter printer(*flow_graph_);
         printer.PrintBlocks();
       }
     }
   }
 }
 
 }  // namespace dart