Revert several inlining related changes.

runtime/vm/flow_graph.cc

Index: runtime/vm/flow_graph.cc
diff --git a/runtime/vm/flow_graph.cc b/runtime/vm/flow_graph.cc
index e923a837c7ba37b3835724d4f3e354b3751d7123..d434d610ebed6c587bd311253424cd663142f8e5 100644
--- a/runtime/vm/flow_graph.cc
+++ b/runtime/vm/flow_graph.cc
@@ -15,12 +15,10 @@ namespace dart {
 DECLARE_FLAG(bool, trace_optimization);
 
 FlowGraph::FlowGraph(const FlowGraphBuilder& builder,
-                     GraphEntryInstr* graph_entry,
-                     intptr_t max_block_id)
+                     GraphEntryInstr* graph_entry)
   : parent_(),
     assigned_vars_(),
     current_ssa_temp_index_(0),
-    max_block_id_(max_block_id),
     parsed_function_(builder.parsed_function()),
     num_copied_params_(builder.num_copied_params()),
     num_non_copied_params_(builder.num_non_copied_params()),
@@ -135,16 +133,14 @@ static void ValidateUseListsInInstruction(Instruction* instr) {
   for (intptr_t i = 0; i < instr->InputCount(); ++i) {
     Value* use = instr->InputAt(i);
     ASSERT(use->use_index() == i);
-    // TODO(zerny): Make this a slow assert.
-    // ASSERT(1 == MembershipCount(use, use->definition()->input_use_list()));
+    ASSERT(1 == MembershipCount(use, use->definition()->input_use_list()));
   }
   if (instr->env() != NULL) {
     intptr_t use_index = 0;
     for (Environment::DeepIterator it(instr->env()); !it.Done(); it.Advance()) {
       Value* use = it.CurrentValue();
       ASSERT(use->use_index() == use_index++);
-      // TODO(zerny): Make this a slow assert.
-      // ASSERT(1 == MembershipCount(use, use->definition()->env_use_list()));
+      ASSERT(1 == MembershipCount(use, use->definition()->env_use_list()));
     }
   }
   Definition* defn = instr->AsDefinition();
@@ -207,9 +203,8 @@ static void RecordInputUses(Instruction* instr) {
     ASSERT(use->instruction() == NULL);
     ASSERT(use->use_index() == -1);
     ASSERT(use->next_use() == NULL);
-    // TODO(zerny): Make this a slow assert.
-    // DEBUG_ASSERT(0 == MembershipCount(use,
-    //                                   use->definition()->input_use_list()));
+    DEBUG_ASSERT(0 == MembershipCount(use,
+                                      use->definition()->input_use_list()));
     use->set_instruction(instr);
     use->set_use_index(i);
     use->AddToInputUseList();
@@ -226,9 +221,7 @@ static void RecordEnvUses(Instruction* instr) {
     ASSERT(use->instruction() == NULL);
     ASSERT(use->use_index() == -1);
     ASSERT(use->next_use() == NULL);
-    // TODO(zerny): Make this a slow assert.
-    // DEBUG_ASSERT(0 ==
-    //              MembershipCount(use, use->definition()->env_use_list()));
+    DEBUG_ASSERT(0 == MembershipCount(use, use->definition()->env_use_list()));
     use->set_instruction(instr);
     use->set_use_index(use_index++);
     use->AddToEnvUseList();
@@ -538,9 +531,6 @@ void FlowGraph::RenameRecursive(BlockEntryInstr* block_entry,
     // Attach current environment to the instruction. First, each instruction
     // gets a full copy of the environment. Later we optimize this by
     // eliminating unnecessary environments.
-    // TODO(zerny): Avoid creating unnecessary environments. Note that some
-    // optimizations need deoptimization info for non-deoptable instructions,
-    // eg, LICM on GOTOs.
     current->set_env(Environment::From(*env,
                                        num_non_copied_params_,
                                        parsed_function_.function()));
@@ -737,38 +727,10 @@ void FlowGraph::Bailout(const char* reason) const {
 }
 
 
-// Helper to reorder phis after splitting a block.  The last instruction(s) of
-// the split block will now have a larger block id than any previously known
-// blocks. If the last instruction jumps to a join, we must reorder phi inputs
-// according to the block order, ie, we move this predecessor to the end.
-static void ReorderPhis(BlockEntryInstr* block) {
-  GotoInstr* jump = block->last_instruction()->AsGoto();
-  if (jump == NULL) return;
-  JoinEntryInstr* join = jump->successor();
-  intptr_t pred_index = join->IndexOfPredecessor(block);
-  intptr_t pred_count = join->PredecessorCount();
-  ASSERT(pred_index >= 0);
-  ASSERT(pred_index < pred_count);
-  // If the predecessor index is the last index there is nothing to update.
-  if ((join->phis() == NULL) || (pred_index + 1 == pred_count)) return;
-  // Otherwise, move the predecessor use to the end in each phi.
-  for (intptr_t i = 0; i < join->phis()->length(); ++i) {
-    PhiInstr* phi = (*join->phis())[i];
-    if (phi == NULL) continue;
-    ASSERT(pred_count == phi->InputCount());
-    // Save the predecessor use.
-    Value* pred_use = phi->InputAt(pred_index);
-    // Move each of the following uses back by one.
-    ASSERT(pred_index < pred_count - 1);  // Will move at least one index.
-    for (intptr_t i = pred_index; i < pred_count - 1; ++i) {
-      Value* use = phi->InputAt(i + 1);
-      phi->SetInputAt(i, use);
-      use->set_use_index(i);
-    }
-    // Write the predecessor use at the end.
-    phi->SetInputAt(pred_count - 1, pred_use);
-    pred_use->set_use_index(pred_count - 1);
-  }
+// Helper to get the block-entry of an instruction.
+static BlockEntryInstr* GetBlockEntry(Instruction* instr) {
+  while (!instr->IsBlockEntry()) instr = instr->previous();
+  return instr->AsBlockEntry();
 }
 
 
@@ -780,13 +742,6 @@ static void Link(Instruction* prev, Instruction* next) {
 }
 
 
-// Helper to sort a list of blocks.
-static int LowestBlockIdFirst(BlockEntryInstr* const* a,
-                              BlockEntryInstr* const* b) {
-  return (*a)->block_id() - (*b)->block_id();
-}
-
-
 // Inline a flow graph at a call site.
 //
 // Assumes the callee graph was computed by BuildGraph with an inlining context
@@ -796,141 +751,47 @@ static int LowestBlockIdFirst(BlockEntryInstr* const* a,
 // After inlining the caller graph will correctly have adjusted the pre/post
 // orders, the dominator tree and the use lists.
 void FlowGraph::InlineCall(Definition* call, FlowGraph* callee_graph) {
-  ASSERT(call->previous() != NULL);
-  ASSERT(call->next() != NULL);
   ASSERT(callee_graph->exits() != NULL);
   ASSERT(callee_graph->graph_entry()->SuccessorCount() == 1);
-  ASSERT(callee_graph->max_block_id() > max_block_id());
   ASSERT(callee_graph->max_virtual_register_number() >
          max_virtual_register_number());
 
-  // Adjust the max block id to the max block id of the callee graph.
-  max_block_id_ = callee_graph->max_block_id();
+  // TODO(zerny): Implement support for callee graphs with control flow.
+  ASSERT(callee_graph->preorder().length() == 2);
 
   // Adjust the SSA temp index by the callee graph's index.
   current_ssa_temp_index_ = callee_graph->max_virtual_register_number();
 
-  BlockEntryInstr* caller_entry = call->GetBlock();
+  BlockEntryInstr* caller_entry = GetBlockEntry(call);
   TargetEntryInstr* callee_entry = callee_graph->graph_entry()->normal_entry();
   ZoneGrowableArray<ReturnInstr*>* callee_exits = callee_graph->exits();
 
-  // Attach the outer environment on each instruction in the callee graph.
-  for (BlockIterator block_it = callee_graph->postorder_iterator();
-       !block_it.Done();
-       block_it.Advance()) {
-    for (ForwardInstructionIterator it(block_it.Current());
-         !it.Done();
-         it.Advance()) {
-      Instruction* instr = it.Current();
-      // TODO(zerny): Avoid creating unnecessary environments. Note that some
-      // optimizations need deoptimization info for non-deoptable instructions,
-      // eg, LICM on GOTOs.
-      if (instr->env() != NULL) call->env()->DeepCopyToOuter(instr);
-    }
+  // 0. Attach the outer environment on each instruction in the callee graph.
+  for (ForwardInstructionIterator it(callee_entry); !it.Done(); it.Advance()) {
+    Instruction* instr = it.Current();
+    if (instr->CanDeoptimize()) call->env()->DeepCopyToOuter(instr);
   }
 
-  // Insert the callee graph into the caller graph.
+  // 1. Insert the callee graph into the caller graph.
   if (callee_exits->is_empty()) {
-    // TODO(zerny): Add support for non-local exits, such as throw.
-    UNREACHABLE();
+    // If no normal exits exist, inline and truncate the block after inlining.
+    Link(call->previous(), callee_entry->next());
+    caller_entry->set_last_instruction(callee_entry->last_instruction());
   } else if (callee_exits->length() == 1) {
     ReturnInstr* exit = (*callee_exits)[0];
-    ASSERT(exit->previous() != NULL);
+    // TODO(zerny): Support one exit graph containing control flow.
+    ASSERT(callee_entry == GetBlockEntry(exit));
     // For just one exit, replace the uses and remove the call from the graph.
     call->ReplaceUsesWith(exit->value()->definition());
     Link(call->previous(), callee_entry->next());
     Link(exit->previous(), call->next());
-    // In case of control flow, locally update the dominator tree.
-    if (callee_graph->preorder().length() > 2) {
-      // The caller block is split and the new block id is that of the exit
-      // block. If the caller block had outgoing edges, reorder the phis so they
-      // are still ordered by block id.
-      ReorderPhis(caller_entry);
-      // The callee return is now the immediate dominator of blocks whose
-      // immediate dominator was the caller entry.
-      BlockEntryInstr* exit_block = exit->GetBlock();
-      ASSERT(exit_block->dominated_blocks().is_empty());
-      for (intptr_t i = 0; i < caller_entry->dominated_blocks().length(); ++i) {
-        BlockEntryInstr* block = caller_entry->dominated_blocks()[i];
-        block->set_dominator(exit_block);
-        exit_block->AddDominatedBlock(block);
-      }
-      // The caller entry is now the immediate dominator of blocks whose
-      // immediate dominator was the callee entry.
-      caller_entry->ClearDominatedBlocks();
-      for (intptr_t i = 0; i < callee_entry->dominated_blocks().length(); ++i) {
-        BlockEntryInstr* block = callee_entry->dominated_blocks()[i];
-        block->set_dominator(caller_entry);
-        caller_entry->AddDominatedBlock(block);
-      }
-      // Recompute the block orders.
-      DiscoverBlocks();
-    }
   } else {
-    // Sort the list of exits by block id.
-    GrowableArray<BlockEntryInstr*> exits(callee_exits->length());
-    for (intptr_t i = 0; i < callee_exits->length(); ++i) {
-      exits.Add((*callee_exits)[i]->GetBlock());
-    }
-    exits.Sort(LowestBlockIdFirst);
-    // Create a join of the returns.
-    JoinEntryInstr* join =
-        new JoinEntryInstr(++max_block_id_, CatchClauseNode::kInvalidTryIndex);
-    for (intptr_t i = 0; i < exits.length(); ++i) {
-      ReturnInstr* exit_instr = exits[i]->last_instruction()->AsReturn();
-      ASSERT(exit_instr != NULL);
-      exit_instr->previous()->Goto(join);
-      // Directly add the predecessors of the join in ascending block id order.
-      join->predecessors_.Add(exits[i]);
-    }
-    // If the call has uses, create a phi of the returns.
-    if ((call->input_use_list() != NULL) ||
-        (call->env_use_list() != NULL)) {
-      // Environment count: length before call - argument count (+ return)
-      intptr_t env_count = call->env()->Length() - call->ArgumentCount();
-      // Add a phi of the return values.
-      join->InsertPhi(env_count, env_count + 1);
-      PhiInstr* phi = join->phis()->Last();
-      phi->set_ssa_temp_index(alloc_ssa_temp_index());
-      phi->mark_alive();
-      for (intptr_t i = 0; i < exits.length(); ++i) {
-        ReturnInstr* exit_instr = exits[i]->last_instruction()->AsReturn();
-        ASSERT(exit_instr != NULL);
-        Value* use = exit_instr->value();
-        phi->SetInputAt(i, use);
-        use->set_instruction(phi);
-        use->set_use_index(i);
-      }
-      // Replace uses of the call with the phi.
-      call->ReplaceUsesWith(phi);
-    }
-    //  Remove the call from the graph.
-    Link(call->previous(), callee_entry->next());
-    Link(join, call->next());
-    // The caller block is split and the new block id is that of the join
-    // block. If the caller block had outgoing edges, reorder the phis so they
-    // are still ordered by block id.
-    ReorderPhis(caller_entry);
-    // Adjust pre/post orders and update the dominator tree.
-    DiscoverBlocks();
-    // TODO(zerny): Compute the dominator frontier locally.
-    GrowableArray<BitVector*> dominance_frontier;
-    ComputeDominators(&dominance_frontier);
+    // TODO(zerny): Support multiple exits.
+    UNREACHABLE();
   }
-}
 
-
-intptr_t FlowGraph::InstructionCount() const {
-  intptr_t size = 0;
-  // Iterate each block, skipping the graph entry.
-  for (intptr_t i = 1; i < preorder_.length(); ++i) {
-    for (ForwardInstructionIterator it(preorder_[i]);
-         !it.Done();
-         it.Advance()) {
-      ++size;
-    }
-  }
-  return size;
+  // TODO(zerny): Adjust pre/post orders.
+  // TODO(zerny): Update dominator tree.
 }