Merge "Revert "ART: Implement try/catch blocks in Builder""

1 files changed, 4 insertions, 33 deletions

diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index 30d61ef040..7d723ef13d 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -252,22 +252,8 @@ class HGraphVisualizerPrinter : public HGraphVisitor {
     AddIndent();
     output_ << "successors";
     for (size_t i = 0, e = block->GetSuccessors().Size(); i < e; ++i) {
-      if (!block->IsExceptionalSuccessor(i)) {
-        HBasicBlock* successor = block->GetSuccessors().Get(i);
-        output_ << " \"B" << successor->GetBlockId() << "\" ";
-      }
-    }
-    output_<< std::endl;
-  }
-
-  void PrintExceptionHandlers(HBasicBlock* block) {
-    AddIndent();
-    output_ << "xhandlers";
-    for (size_t i = 0, e = block->GetSuccessors().Size(); i < e; ++i) {
-      if (block->IsExceptionalSuccessor(i)) {
-        HBasicBlock* handler = block->GetSuccessors().Get(i);
-        output_ << " \"B" << handler->GetBlockId() << "\" ";
-      }
+      HBasicBlock* successor = block->GetSuccessors().Get(i);
+      output_ << " \"B" << successor->GetBlockId() << "\" ";
     }
     if (block->IsExitBlock() &&
         (disasm_info_ != nullptr) &&
@@ -379,15 +365,6 @@ class HGraphVisualizerPrinter : public HGraphVisitor {
                                       << std::noboolalpha;
   }
 
-  void VisitTryBoundary(HTryBoundary* try_boundary) OVERRIDE {
-    StartAttributeStream("is_entry") << std::boolalpha
-                                     << try_boundary->IsTryEntry()
-                                     << std::noboolalpha;
-    StartAttributeStream("is_exit") << std::boolalpha
-                                    << try_boundary->IsTryExit()
-                                    << std::noboolalpha;
-  }
-
   bool IsPass(const char* name) {
     return strcmp(pass_name_, name) == 0;
   }
@@ -602,14 +579,8 @@ class HGraphVisualizerPrinter : public HGraphVisitor {
     }
     PrintPredecessors(block);
     PrintSuccessors(block);
-    PrintExceptionHandlers(block);
-
-    if (block->IsCatchBlock()) {
-      PrintProperty("flags", "catch_block");
-    } else {
-      PrintEmptyProperty("flags");
-    }
-
+    PrintEmptyProperty("xhandlers");
+    PrintEmptyProperty("flags");
     if (block->GetDominator() != nullptr) {
       PrintProperty("dominator", "B", block->GetDominator()->GetBlockId());
     }