diff options
| author | Bill Buzbee <buzbee@android.com> | 2014-11-17 21:15:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-17 21:15:59 +0000 |
| commit | 5d99e333bcb454add372fe776a00d3172146bd6b (patch) | |
| tree | f9491583f891133af0ff9a5660fce701b3ad64ae /compiler/dex/quick/mir_to_lir.cc | |
| parent | 144ed95fce0cd801a7b5e8efb42704a14dd06fb9 (diff) | |
| parent | 56e8e608647133ae248acfec36e704c54c40c620 (diff) | |
| download | art-5d99e333bcb454add372fe776a00d3172146bd6b.tar.gz art-5d99e333bcb454add372fe776a00d3172146bd6b.tar.bz2 art-5d99e333bcb454add372fe776a00d3172146bd6b.zip | |
Merge "ART: copy dalvikInsn back on throw instruction processing"
Diffstat (limited to 'compiler/dex/quick/mir_to_lir.cc')
| -rw-r--r-- | compiler/dex/quick/mir_to_lir.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc index 92ef70db7e..c945f7f891 100644 --- a/compiler/dex/quick/mir_to_lir.cc +++ b/compiler/dex/quick/mir_to_lir.cc @@ -1238,7 +1238,7 @@ bool Mir2Lir::MethodBlockCodeGen(BasicBlock* bb) { if (opcode == kMirOpCheck) { // Combine check and work halves of throwing instruction. MIR* work_half = mir->meta.throw_insn; - mir->dalvikInsn.opcode = work_half->dalvikInsn.opcode; + mir->dalvikInsn = work_half->dalvikInsn; 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; |