# HG changeset patch # User Josef Eisl # Date 1437670461 -7200 # Node ID e50e1e67e17e3a99bf862e77bb2e6ca4f4db680a # Parent b4882e47c1f243d46938688b1a3f0ee358e711a6 LinearScan: change visibility. diff -r b4882e47c1f2 -r e50e1e67e17e graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Thu Jul 23 18:27:09 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Thu Jul 23 18:54:21 2015 +0200 @@ -115,7 +115,7 @@ final List> sortedBlocks; /** @see #intervals() */ - private Interval[] intervals; + protected Interval[] intervals; /** * The number of valid entries in {@link #intervals}. diff -r b4882e47c1f2 -r e50e1e67e17e graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Thu Jul 23 18:27:09 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Thu Jul 23 18:54:21 2015 +0200 @@ -352,7 +352,7 @@ } } - private void reportFailure(int numBlocks) { + protected void reportFailure(int numBlocks) { try (Scope s = Debug.forceLog()) { try (Indent indent = Debug.logAndIndent("report failure")) { @@ -436,7 +436,7 @@ } } - private void verifyLiveness() { + protected void verifyLiveness() { /* * Check that fixed intervals are not live at block boundaries (live set must be empty at * fixed intervals). @@ -520,7 +520,7 @@ } } - changeSpillDefinitionPos(interval, defPos); + changeSpillDefinitionPos(op, operand, interval, defPos); if (registerPriority == RegisterPriority.None && interval.spillState().ordinal() <= SpillState.StartInMemory.ordinal() && isStackSlot(operand)) { // detection of method-parameters and roundfp-results interval.setSpillState(SpillState.StartInMemory); @@ -591,8 +591,11 @@ /** * Eliminates moves from register to stack if the stack slot is known to be correct. + * + * @param op + * @param operand */ - void changeSpillDefinitionPos(Interval interval, int defPos) { + protected void changeSpillDefinitionPos(LIRInstruction op, AllocatableValue operand, Interval interval, int defPos) { assert interval.isSplitParent() : "can only be called for split parents"; switch (interval.spillState()) { diff -r b4882e47c1f2 -r e50e1e67e17e graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/SSALinearScanLifetimeAnalysisPhase.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/SSALinearScanLifetimeAnalysisPhase.java Thu Jul 23 18:27:09 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/SSALinearScanLifetimeAnalysisPhase.java Thu Jul 23 18:54:21 2015 +0200 @@ -60,7 +60,7 @@ } } - private static void setHint(final LIRInstruction op, Interval target, Interval source) { + static void setHint(final LIRInstruction op, Interval target, Interval source) { Interval currentHint = target.locationHint(false); if (currentHint == null || currentHint.from() > target.from()) { /*