Revert "ART: Implement try/catch blocks in Builder"
Causes OutOfMemory issues, need to investigate.
This reverts commit 0b5c7d1994b76090afcc825e737f2b8c546da2f8.
Change-Id: I263e6cc4df5f9a56ad2ce44e18932ca51d7e349f
diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc
index d7e6bd8..fd28f0b 100644
--- a/compiler/optimizing/graph_checker.cc
+++ b/compiler/optimizing/graph_checker.cc
@@ -81,10 +81,7 @@
}
// Ensure `block` ends with a branch instruction.
- // This invariant is not enforced on non-SSA graphs. Graph built from DEX with
- // dead code that falls out of the method will not end with a control-flow
- // instruction. Such code is removed during the SSA-building DCE phase.
- if (GetGraph()->IsInSsaForm() && !block->EndsWithControlFlowInstruction()) {
+ if (!block->EndsWithControlFlowInstruction()) {
AddError(StringPrintf("Block %d does not end with a branch instruction.",
block->GetBlockId()));
}
@@ -256,22 +253,6 @@
}
}
-void GraphChecker::VisitReturn(HReturn* ret) {
- if (!ret->GetBlock()->GetSingleSuccessor()->IsExitBlock()) {
- AddError(StringPrintf("%s:%d does not jump to the exit block.",
- ret->DebugName(),
- ret->GetId()));
- }
-}
-
-void GraphChecker::VisitReturnVoid(HReturnVoid* ret) {
- if (!ret->GetBlock()->GetSingleSuccessor()->IsExitBlock()) {
- AddError(StringPrintf("%s:%d does not jump to the exit block.",
- ret->DebugName(),
- ret->GetId()));
- }
-}
-
void SSAChecker::VisitBasicBlock(HBasicBlock* block) {
super_type::VisitBasicBlock(block);