diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-09 10:28:50 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-11 14:23:38 +0000 |
| commit | 234d69d075d1608f80adb647f7935077b62b6376 (patch) | |
| tree | f6b68ff38722dc91bd0de2387609ee0ce950e0ce /compiler/optimizing/ssa_liveness_analysis.h | |
| parent | 31df246d330c45f5691e226d176d0c59450f8435 (diff) | |
| download | android_art-234d69d075d1608f80adb647f7935077b62b6376.tar.gz android_art-234d69d075d1608f80adb647f7935077b62b6376.tar.bz2 android_art-234d69d075d1608f80adb647f7935077b62b6376.zip | |
Revert "Revert "[optimizing] Enable x86 long support.""
This reverts commit 154552e666347d41d95d7619c6ee56249ff4feca.
Change-Id: Idc726551c249a888b7ff5fde8508ae50e81b2e13
Diffstat (limited to 'compiler/optimizing/ssa_liveness_analysis.h')
| -rw-r--r-- | compiler/optimizing/ssa_liveness_analysis.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/optimizing/ssa_liveness_analysis.h b/compiler/optimizing/ssa_liveness_analysis.h index 9ff2f205d8..5787f0cc4e 100644 --- a/compiler/optimizing/ssa_liveness_analysis.h +++ b/compiler/optimizing/ssa_liveness_analysis.h @@ -373,13 +373,17 @@ class LiveInterval : public ArenaObject<kArenaAllocMisc> { if (location.IsUnallocated()) { if ((location.GetPolicy() == Location::kRequiresRegister) || (location.GetPolicy() == Location::kSameAsFirstInput - && locations->InAt(0).GetPolicy() == Location::kRequiresRegister)) { + && (locations->InAt(0).IsRegister() + || locations->InAt(0).IsRegisterPair() + || locations->InAt(0).GetPolicy() == Location::kRequiresRegister))) { return position; } else if ((location.GetPolicy() == Location::kRequiresFpuRegister) || (location.GetPolicy() == Location::kSameAsFirstInput && locations->InAt(0).GetPolicy() == Location::kRequiresFpuRegister)) { return position; } + } else if (location.IsRegister() || location.IsRegisterPair()) { + return position; } } |