diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-10-07 14:26:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-07 14:26:48 +0000 |
| commit | 0d6102a80ec741d701788decfb701a657d7a98f7 (patch) | |
| tree | 541765a4b48b45077e08ca72d2b1c0b65fd562b9 /compiler | |
| parent | 45eaba56a9d847fed21f215bd9e9cbc2f8a7b14d (diff) | |
| parent | cc8cc7c7e2ba24667c0765b29c4417a5bf1d91c4 (diff) | |
| download | art-0d6102a80ec741d701788decfb701a657d7a98f7.zip art-0d6102a80ec741d701788decfb701a657d7a98f7.tar.gz art-0d6102a80ec741d701788decfb701a657d7a98f7.tar.bz2 | |
Merge "Propagate optimization flags to kMirOpCheck."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/mir_to_lir.cc | 1 |
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; |