diff options
| author | Andreas Gampe <agampe@google.com> | 2014-06-24 18:42:06 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-06-24 18:42:06 +0000 |
| commit | de68676b24f61a55adc0b22fe828f036a5925c41 (patch) | |
| tree | c71dacfb709787b57fba2ce117fb8ba120d7b150 /compiler/dex/quick/x86/call_x86.cc | |
| parent | 2689fbad6b5ec1ae8f8c8791a80c6fd3cf24144d (diff) | |
| download | android_art-de68676b24f61a55adc0b22fe828f036a5925c41.tar.gz android_art-de68676b24f61a55adc0b22fe828f036a5925c41.tar.bz2 android_art-de68676b24f61a55adc0b22fe828f036a5925c41.zip | |
Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"
This reverts commit 2689fbad6b5ec1ae8f8c8791a80c6fd3cf24144d.
Breaks the build.
Change-Id: I9faad4e9a83b32f5f38b2ef95d6f9a33345efa33
Diffstat (limited to 'compiler/dex/quick/x86/call_x86.cc')
| -rw-r--r-- | compiler/dex/quick/x86/call_x86.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/dex/quick/x86/call_x86.cc b/compiler/dex/quick/x86/call_x86.cc index 425caec177..28195aba36 100644 --- a/compiler/dex/quick/x86/call_x86.cc +++ b/compiler/dex/quick/x86/call_x86.cc @@ -295,8 +295,7 @@ void X86Mir2Lir::GenEntrySequence(RegLocation* ArgLocs, RegLocation rl_method) { setup_method_address_[0] = NewLIR1(kX86StartOfMethod, rs_rX86_ARG0.GetReg()); int displacement = SRegOffset(base_of_code_->s_reg_low); // Native pointer - must be natural word size. - setup_method_address_[1] = StoreBaseDisp(rs_rX86_SP, displacement, rs_rX86_ARG0, - Gen64Bit() ? k64 : k32, kNotVolatile); + setup_method_address_[1] = StoreBaseDisp(rs_rX86_SP, displacement, rs_rX86_ARG0, Gen64Bit() ? k64 : k32); } FreeTemp(rs_rX86_ARG0); |