diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-06 16:10:14 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-06 16:10:14 +0000 |
| commit | 154552e666347d41d95d7619c6ee56249ff4feca (patch) | |
| tree | b8bdb820be33317f23ef1d3e43d13b2b6bfb3ba5 /compiler/optimizing/locations.h | |
| parent | b4ba354cf8d22b261205494875cc014f18587b50 (diff) | |
| download | android_art-154552e666347d41d95d7619c6ee56249ff4feca.tar.gz android_art-154552e666347d41d95d7619c6ee56249ff4feca.tar.bz2 android_art-154552e666347d41d95d7619c6ee56249ff4feca.zip | |
Revert "[optimizing] Enable x86 long support."
Few libcore failures.
This reverts commit b4ba354cf8d22b261205494875cc014f18587b50.
Change-Id: I4a28d853e730dff9b69aec9555505803cf2fcd63
Diffstat (limited to 'compiler/optimizing/locations.h')
| -rw-r--r-- | compiler/optimizing/locations.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/compiler/optimizing/locations.h b/compiler/optimizing/locations.h index 566c0daf1e..198cc15cce 100644 --- a/compiler/optimizing/locations.h +++ b/compiler/optimizing/locations.h @@ -211,25 +211,15 @@ class Location : public ValueObject { } Location ToLow() const { - if (IsRegisterPair()) { - return Location::RegisterLocation(low()); - } else if (IsFpuRegisterPair()) { - return Location::FpuRegisterLocation(low()); - } else { - DCHECK(IsDoubleStackSlot()); - return Location::StackSlot(GetStackIndex()); - } + return IsRegisterPair() + ? Location::RegisterLocation(low()) + : Location::FpuRegisterLocation(low()); } Location ToHigh() const { - if (IsRegisterPair()) { - return Location::RegisterLocation(high()); - } else if (IsFpuRegisterPair()) { - return Location::FpuRegisterLocation(high()); - } else { - DCHECK(IsDoubleStackSlot()); - return Location::StackSlot(GetHighStackIndex(4)); - } + return IsRegisterPair() + ? Location::RegisterLocation(high()) + : Location::FpuRegisterLocation(high()); } static uintptr_t EncodeStackIndex(intptr_t stack_index) { |