# HG changeset patch # User Josef Eisl # Date 1422698835 -3600 # Node ID 09292c24d555eb337942d3655a01a6092efc5c86 # Parent a4c9a0fe4bd587c928a2e14a5d0d8ae01685e34d LSStackSlotAllocator: hide inner class. diff -r a4c9a0fe4bd5 -r 09292c24d555 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java --- 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()); }); } diff -r a4c9a0fe4bd5 -r 09292c24d555 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java --- 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; }