Mercurial > hg > graal-compiler
changeset 22365:1b0304bcf701
Fix checkstyle and findbugs issues.
| author | Josef Eisl <josef.eisl@jku.at> |
|---|---|
| date | Mon, 27 Jul 2015 09:59:44 +0200 |
| parents | fd8b493efd48 |
| children | 8c6bc650d7fa |
| files | graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanLifetimeAnalysisPhase.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIUtil.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java |
| diffstat | 5 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Mon Jul 27 09:44:55 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Mon Jul 27 09:59:44 2015 +0200 @@ -49,7 +49,7 @@ } /** - * Build traces of sequentially executed blocks + * Build traces of sequentially executed blocks. */ public static <T extends AbstractBlockBase<T>> TraceBuilderResult<T> computeTraces(T startBlock, List<T> blocks) { return new TraceBuilder<>(blocks).build(startBlock);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanLifetimeAnalysisPhase.java Mon Jul 27 09:44:55 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanLifetimeAnalysisPhase.java Mon Jul 27 09:59:44 2015 +0200 @@ -140,10 +140,7 @@ Value fromValue = outgoing.getOutgoingValue(i); assert sameTrace(block, pred) || !isVariable(fromValue) : "Unallocated variable: " + fromValue; - if (isStackSlotValue(fromValue)) { - - } else if (isConstant(fromValue)) { - } else { + if (!isStackSlotValue(fromValue) && !isConstant(fromValue)) { Interval from = allocator.getOrCreateInterval((AllocatableValue) fromValue); Interval to = allocator.getOrCreateInterval((AllocatableValue) toValue); setHint(label, to, from);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Mon Jul 27 09:44:55 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Mon Jul 27 09:59:44 2015 +0200 @@ -42,7 +42,7 @@ private static final class BlockData { - /** Mapping from value to index into {@link #incoming} */ + /** Mapping from value to index into {@link #incoming}. */ private final ValueMap<Value, Integer> valueIndexMap; private final ArrayList<Value> incoming; private final ArrayList<Value> outgoing;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIUtil.java Mon Jul 27 09:44:55 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIUtil.java Mon Jul 27 09:59:44 2015 +0200 @@ -147,7 +147,7 @@ public static void forEachValuePair(LIR lir, AbstractBlockBase<?> toBlock, AbstractBlockBase<?> fromBlock, PhiValueVisitor visitor) { assert toBlock.getPredecessors().contains(fromBlock) : String.format("%s not in predecessor list: %s", fromBlock, toBlock.getPredecessors()); assert fromBlock.getSuccessorCount() == 1 || toBlock.getPredecessorCount() == 1 : String.format("Critical Edge? %s has %d successors and %s has %d predecessors", fromBlock, - fromBlock.getSuccessors(), toBlock, toBlock.getPredecessorCount()); + fromBlock.getSuccessorCount(), toBlock, toBlock.getPredecessorCount()); assert fromBlock.getSuccessors().contains(toBlock) : String.format("Predecessor block %s has wrong successor: %s, should contain: %s", fromBlock, fromBlock.getSuccessors(), toBlock); BlockEndOp blockEnd = outgoing(lir, fromBlock);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Mon Jul 27 09:44:55 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Mon Jul 27 09:59:44 2015 +0200 @@ -37,7 +37,7 @@ import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.LabelOp; -public class SSIVerifier { +public final class SSIVerifier { public static boolean verify(LIR lir) { return new SSIVerifier(lir).verify();