Bug 1012964 - IonMonkey: Follow-up patch to give a variable a better name. r=me DONTBUILD
authorDan Gohman <sunfish@mozilla.com>
Tue, 20 May 2014 13:51:22 -0700
changeset 184025 a7a36e1dca08277aba3620c788bdb10edb0b7d5f
parent 184024 a6cf64544f9b9c82e3bde274db80bd2a2fa3be4e
child 184026 0253f2720564f5daac9efdf45a9082328c0e4cfe
push id26810
push usercbook@mozilla.com
push dateWed, 21 May 2014 11:46:36 +0000
treeherdermozilla-central@50fb8c4db2fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1012964
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1012964 - IonMonkey: Follow-up patch to give a variable a better name. r=me DONTBUILD
js/src/jit/LiveRangeAllocator.cpp
--- a/js/src/jit/LiveRangeAllocator.cpp
+++ b/js/src/jit/LiveRangeAllocator.cpp
@@ -114,29 +114,29 @@ LiveInterval::addRange(CodePosition from
     for (i = ranges_.end(); i > ranges_.begin(); i--) {
         if (newRange.from <= i[-1].to) {
             if (i[-1].from < newRange.from)
                 newRange.from = i[-1].from;
             break;
         }
     }
     // Perform coalescing on overlapping ranges
-    Range *j = i;
+    Range *coalesceEnd = i;
     for (; i > ranges_.begin(); i--) {
         if (newRange.to < i[-1].from)
             break;
         if (newRange.to < i[-1].to)
             newRange.to = i[-1].to;
     }
 
-    if (i == j)
+    if (i == coalesceEnd)
         return ranges_.insert(i, newRange);
 
     i[0] = newRange;
-    ranges_.erase(i + 1, j);
+    ranges_.erase(i + 1, coalesceEnd);
     return true;
 }
 
 void
 LiveInterval::setFrom(CodePosition from)
 {
     while (!ranges_.empty()) {
         if (ranges_.back().to < from) {