diff options
| author | 2015-07-07 16:46:06 +0000 | |
|---|---|---|
| committer | 2015-07-07 16:46:08 +0000 | |
| commit | 53ed3c5f71c983f01cd10a805255c1301438ab8c (patch) | |
| tree | bd1046129de4c37a92ddb4f64aa9eb82ff98f52a /compiler | |
| parent | ee35ff809616324cbada38cbc0610eb09da09b35 (diff) | |
| parent | 185a5586c8b796e770e9b4b7ac2befa8ccdaca7e (diff) | |
Merge "ART: Fix opsize in LoadArgDirect"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/mir_to_lir.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc index 7ca03cf0ee..c50246d182 100644 --- a/compiler/dex/quick/mir_to_lir.cc +++ b/compiler/dex/quick/mir_to_lir.cc @@ -193,7 +193,8 @@ void Mir2Lir::LoadArgDirect(size_t in_position, RegLocation rl_dest) { } if (!reg_arg.Valid()) { - LoadBaseDisp(TargetPtrReg(kSp), offset, rl_dest.reg, rl_dest.wide ? k64 : k32, kNotVolatile); + OpSize op_size = rl_dest.wide ? k64 : (rl_dest.ref ? kReference : k32); + LoadBaseDisp(TargetPtrReg(kSp), offset, rl_dest.reg, op_size, kNotVolatile); } else { if (rl_dest.wide) { OpRegCopyWide(rl_dest.reg, reg_arg); |