diff options
| author | 2015-01-20 23:44:21 +0000 | |
|---|---|---|
| committer | 2015-01-20 23:44:21 +0000 | |
| commit | e355ab6374e546bcd388a7d54b67d3df493fdadb (patch) | |
| tree | 34789eac002e806be3796ab91cc62a48d1cf130a /compiler/dex/quick/gen_invoke.cc | |
| parent | c9aa8f88b7e710e90ac161654f1f5052aac44823 (diff) | |
| parent | f681570077563bb529a30f9e7c572b837cecfb83 (diff) | |
Merge "ART: Make some helpers non-virtual in Mir2Lir"
Diffstat (limited to 'compiler/dex/quick/gen_invoke.cc')
| -rwxr-xr-x | compiler/dex/quick/gen_invoke.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc index 73629e8b7c..2a6dfefe22 100755 --- a/compiler/dex/quick/gen_invoke.cc +++ b/compiler/dex/quick/gen_invoke.cc @@ -918,8 +918,8 @@ bool Mir2Lir::GenInlinedReferenceGetReferent(CallInfo* info) { RegStorage reg_slow_path = AllocTemp(); RegStorage reg_disabled = AllocTemp(); - Load8Disp(reg_class, slow_path_flag_offset, reg_slow_path); - Load8Disp(reg_class, disable_flag_offset, reg_disabled); + LoadBaseDisp(reg_class, slow_path_flag_offset, reg_slow_path, kSignedByte, kNotVolatile); + LoadBaseDisp(reg_class, disable_flag_offset, reg_disabled, kSignedByte, kNotVolatile); FreeTemp(reg_class); LIR* or_inst = OpRegRegReg(kOpOr, reg_slow_path, reg_slow_path, reg_disabled); FreeTemp(reg_disabled); |