summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2014-03-04 11:46:14 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-03-04 11:46:14 +0000
commit093aad184b4451639951a7e012d9b55cbf8c8a07 (patch)
tree1beaa08f9f04dbe1a9072207fbe0befda31f5fe2
parenta071575c616f1f8f6d462cc74e04cebf1b7e276d (diff)
parent39d95e695e2ef1fbd420eba6ceaa40c688099c30 (diff)
Merge "Remove unreachable catch entries in GenSpecialCase()."
-rw-r--r--compiler/dex/quick/mir_to_lir.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc
index 711f34a9d2..d9b241e864 100644
--- a/compiler/dex/quick/mir_to_lir.cc
+++ b/compiler/dex/quick/mir_to_lir.cc
@@ -233,6 +233,11 @@ bool Mir2Lir::GenSpecialCase(BasicBlock* bb, MIR* mir, const InlineMethod& speci
}
if (successful) {
+ if (kIsDebugBuild) {
+ // Clear unreachable catch entries.
+ mir_graph_->catches_.clear();
+ }
+
// Handle verbosity for return MIR.
if (return_mir != nullptr) {
current_dalvik_offset_ = return_mir->offset;