- Cleanup FlowGraph:

runtime/vm/flow_graph.cc

Index: runtime/vm/flow_graph.cc
===================================================================
--- runtime/vm/flow_graph.cc	(revision 37470)
+++ runtime/vm/flow_graph.cc	(working copy)
@@ -15,7 +15,6 @@
 DECLARE_FLAG(bool, reorder_basic_blocks);
 DECLARE_FLAG(bool, trace_optimization);
 DECLARE_FLAG(bool, verify_compiler);
-DEFINE_FLAG(bool, optimize_try_catch, true, "Optimization of try-catch");
 
 
 FlowGraph::FlowGraph(const FlowGraphBuilder& builder,
@@ -181,9 +180,7 @@
 }
 
 
-#ifdef DEBUG
 // Debugging code to verify the construction of use lists.
-
 static intptr_t MembershipCount(Value* use, Value* list) {
   intptr_t count = 0;
   while (list != NULL) {
@@ -281,7 +278,6 @@
   }
   return true;  // Return true so we can ASSERT validation.
 }
-#endif  // DEBUG
 
 
 LivenessAnalysis::LivenessAnalysis(
@@ -718,9 +714,6 @@
                        VariableLivenessAnalysis* variable_liveness,
                        ZoneGrowableArray<Definition*>* inlining_parameters) {
   GraphEntryInstr* entry = graph_entry();
-  if (!FLAG_optimize_try_catch && (entry->SuccessorCount() > 1)) {
-    Bailout("Catch-entry support in SSA.");
-  }
 
   // Initial renaming environment.
   GrowableArray<Definition*> env(variable_count());
@@ -1145,18 +1138,6 @@
 }
 
 
-void FlowGraph::Bailout(const char* reason) const {
-  const Function& function = parsed_function_.function();
-  Report::MessageF(Report::kBailout,
-                   Script::Handle(function.script()),
-                   function.token_pos(),
-                   "FlowGraph Bailout: %s %s",
-                   String::Handle(function.name()).ToCString(),
-                   reason);
-  UNREACHABLE();
-}
-
-
 intptr_t FlowGraph::InstructionCount() const {
   intptr_t size = 0;
   // Iterate each block, skipping the graph entry.