commit f64a6ab5f69446303faadbf6a0ede00af435e25c
author Matthew Gharrity <gharrma@google.com> Mon Jul 11 14:45:01 2016 -0700
committer Matthew Gharrity <gharrma@google.com> Tue Jul 12 10:20:55 2016 -0700
tree a445bbe8fa31ad699b91eee3386e0ac2864f561a
parent dedde3f10d7801ad862d1ca1de89135decff6a60

Improve search for available spill slots in RA

Previously we always searched for two adjacent spill slots, even if
we only needed one. This small change fixes that.

Test: m test-art-host

Change-Id: I021d355e6602ffee687c8537a959232b1504dcf1

compiler/optimizing/register_allocator.cc

diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc
index 9d99668..1b33408 100644
--- a/compiler/optimizing/register_allocator.cc
+++ b/compiler/optimizing/register_allocator.cc
@@ -1346,9 +1346,15 @@
   // Find an available spill slot.
   size_t slot = 0;
   for (size_t e = spill_slots->size(); slot < e; ++slot) {
-    if ((*spill_slots)[slot] <= parent->GetStart()
-        && (slot == (e - 1) || (*spill_slots)[slot + 1] <= parent->GetStart())) {
-      break;
+    if ((*spill_slots)[slot] <= parent->GetStart()) {
+      if (!parent->NeedsTwoSpillSlots()) {
+        // One spill slot is sufficient.
+        break;
+      }
+      if (slot == e - 1 || (*spill_slots)[slot + 1] <= parent->GetStart()) {
+        // Two spill slots are available.
+        break;
+      }
     }
   }