Mercurial > hg > truffle

changeset 19083:09292c24d555

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
LSStackSlotAllocator: hide inner class.
author Josef Eisl <josef.eisl@jku.at>
date Sat, 31 Jan 2015 11:07:15 +0100
parents a4c9a0fe4bd5
children 8e1c9c73ce24
files graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java	Sat Jan 31 11:01:45 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java	Sat Jan 31 11:07:15 2015 +0100
@@ -67,7 +67,7 @@
         new Allocator(res.getLIR(), builder).allocate();
     }
 
-    static final class Allocator extends InstructionNumberer {
+    private static final class Allocator extends InstructionNumberer {
         private final LIR lir;
         private final FrameMapBuilderTool frameMapBuilder;
         private final StackInterval[] stackSlotMap;
@@ -340,7 +340,7 @@
 
         private void verifyIntervals() {
             forEachInterval(interval -> {
-                assert interval.verify(this);
+                assert interval.verify(maxOpId());
             });
         }
 
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java	Sat Jan 31 11:01:45 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java	Sat Jan 31 11:07:15 2015 +0100
@@ -40,9 +40,9 @@
         this.kind = kind;
     }
 
-    public boolean verify(LSStackSlotAllocator.Allocator allocator) {
-        // maxOpId + 1 it the last position in the last block (i.e. the "write position")
-        assert from >= 0 && to <= allocator.maxOpId() + 1 : String.format("from %d, to %d, maxOpId %d", from, to, allocator.maxOpId());
+    public boolean verify(int maxOpId) {
+        // maxOpId + 1 is the last position in the last block (i.e. the "write position")
+        assert 0 <= from && from <= to && to <= maxOpId + 1 : String.format("from %d, to %d, maxOpId %d", from, to, maxOpId);
         return true;
     }