summaryrefslogtreecommitdiffstats
path: root/compiler
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2014-10-06 10:52:20 +0100
committerVladimir Marko <vmarko@google.com>2014-10-06 10:53:33 +0100
commitcc8cc7c7e2ba24667c0765b29c4417a5bf1d91c4 (patch)
treee73d0dddaaf66edbbcf8dac5a8b3ac85e3ae59b6 /compiler
parent2d4e89e97812aeca16ff058d7286f29b7549c43a (diff)
downloadart-cc8cc7c7e2ba24667c0765b29c4417a5bf1d91c4.zip
art-cc8cc7c7e2ba24667c0765b29c4417a5bf1d91c4.tar.gz
art-cc8cc7c7e2ba24667c0765b29c4417a5bf1d91c4.tar.bz2
Propagate optimization flags to kMirOpCheck.
Bug: 17751474 Change-Id: I9561b641d956e21dac686c7cd414fa0c6a176147
Diffstat (limited to 'compiler')
-rw-r--r--compiler/dex/quick/mir_to_lir.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc
index e7160ad..0ac1299 100644
--- a/compiler/dex/quick/mir_to_lir.cc
+++ b/compiler/dex/quick/mir_to_lir.cc
@@ -1235,6 +1235,7 @@ bool Mir2Lir::MethodBlockCodeGen(BasicBlock* bb) {
// Combine check and work halves of throwing instruction.
MIR* work_half = mir->meta.throw_insn;
mir->dalvikInsn.opcode = work_half->dalvikInsn.opcode;
+ mir->optimization_flags = work_half->optimization_flags;
mir->meta = work_half->meta; // Whatever the work_half had, we need to copy it.
opcode = work_half->dalvikInsn.opcode;
SSARepresentation* ssa_rep = work_half->ssa_rep;