Mercurial > hg > graal-compiler
changeset 14806:a8723f1ff542
LIR renamed setter and getter functions.
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java Mon Mar 17 19:18:35 2014 +0100 @@ -123,7 +123,7 @@ lirGen.emitAdd(Constant.forLong(42), Constant.forLong(73)); List<LIRInstruction> lirList = null; - lir.setLir(b, lirList); + lir.setLIRforBlock(b, lirList); // register allocation lirGen.getFrameMap().finish();
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Mon Mar 17 19:18:35 2014 +0100 @@ -74,7 +74,7 @@ this.lir = lir; for (AbstractBlock<?> block : lir.codeEmittingOrder()) { - for (LIRInstruction instr : lir.lir(block)) { + for (LIRInstruction instr : lir.getLIRforBlock(block)) { collectStats(instr); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Mon Mar 17 19:18:35 2014 +0100 @@ -211,7 +211,7 @@ } private static void emitBlock(LIRGenerator lirGen, Block b, StructuredGraph graph, BlockMap<List<ScheduledNode>> blockMap) { - if (lirGen.getLIR().lir(b) == null) { + if (lirGen.getLIR().getLIRforBlock(b) == null) { for (Block pred : b.getPredecessors()) { if (!b.isLoopHeader() || !pred.isLoopEnd()) { emitBlock(lirGen, pred, graph, blockMap);
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Mon Mar 17 19:18:35 2014 +0100 @@ -172,13 +172,13 @@ } public int getFirstLirInstructionId(AbstractBlock<?> block) { - int result = ir.lir(block).get(0).id(); + int result = ir.getLIRforBlock(block).get(0).id(); assert result >= 0; return result; } public int getLastLirInstructionId(AbstractBlock<?> block) { - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); int result = instructions.get(instructions.size() - 1).id(); assert result >= 0; return result; @@ -517,7 +517,7 @@ LIRInsertionBuffer insertionBuffer = new LIRInsertionBuffer(); for (AbstractBlock<?> block : sortedBlocks) { - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); int numInst = instructions.size(); // iterate all instructions of the block. skip the first because it is always a label @@ -624,7 +624,7 @@ // Assign IDs to LIR nodes and build a mapping, lirOps, from ID to LIRInstruction node. int numInstructions = 0; for (AbstractBlock<?> block : sortedBlocks) { - numInstructions += ir.lir(block).size(); + numInstructions += ir.getLIRforBlock(block).size(); } // initialize with correct length @@ -636,7 +636,7 @@ for (AbstractBlock<?> block : sortedBlocks) { blockData.put(block, new BlockData()); - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); int numInst = instructions.size(); for (int j = 0; j < numInst; j++) { @@ -681,7 +681,7 @@ final BitSet liveGen = new BitSet(liveSize); final BitSet liveKill = new BitSet(liveSize); - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); int numInst = instructions.size(); // iterate all instructions of the block @@ -920,7 +920,7 @@ if (blockData.get(block).liveGen.get(operandNum)) { usedIn.add(block); try (Indent indent3 = Debug.logAndIndent("used in block B%d", block.getId())) { - for (LIRInstruction ins : ir.lir(block)) { + for (LIRInstruction ins : ir.getLIRforBlock(block)) { try (Indent indent4 = Debug.logAndIndent("%d: %s", ins.id(), ins)) { ins.forEachState(new ValueProcedure() { @@ -937,7 +937,7 @@ if (blockData.get(block).liveKill.get(operandNum)) { definedIn.add(block); try (Indent indent3 = Debug.logAndIndent("defined in block B%d", block.getId())) { - for (LIRInstruction ins : ir.lir(block)) { + for (LIRInstruction ins : ir.getLIRforBlock(block)) { Debug.log("%d: %s", ins.id(), ins); } } @@ -1161,7 +1161,7 @@ AbstractBlock<?> block = blockAt(i); Indent indent2 = Debug.logAndIndent("handle block %d", block.getId()); - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); final int blockFrom = getFirstLirInstructionId(block); int blockTo = getLastLirInstructionId(block); @@ -1510,7 +1510,7 @@ if (fromBlock.getSuccessorCount() <= 1) { Debug.log("inserting moves at end of fromBlock B%d", fromBlock.getId()); - List<LIRInstruction> instructions = ir.lir(fromBlock); + List<LIRInstruction> instructions = ir.getLIRforBlock(fromBlock); LIRInstruction instr = instructions.get(instructions.size() - 1); if (instr instanceof StandardOp.JumpOp) { // insert moves before branch @@ -1523,7 +1523,7 @@ Debug.log("inserting moves at beginning of toBlock B%d", toBlock.getId()); if (DetailedAsserts.getValue()) { - assert ir.lir(fromBlock).get(0) instanceof StandardOp.LabelOp : "block does not start with a label"; + assert ir.getLIRforBlock(fromBlock).get(0) instanceof StandardOp.LabelOp : "block does not start with a label"; // because the number of predecessor edges matches the number of // successor edges, blocks which are reached by switch statements @@ -1534,7 +1534,7 @@ } } - moveResolver.setInsertPosition(ir.lir(toBlock), 1); + moveResolver.setInsertPosition(ir.getLIRforBlock(toBlock), 1); } } @@ -1554,7 +1554,7 @@ // check if block has only one predecessor and only one successor if (block.getPredecessorCount() == 1 && block.getSuccessorCount() == 1) { - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); assert instructions.get(0) instanceof StandardOp.LabelOp : "block must start with label"; assert instructions.get(instructions.size() - 1) instanceof StandardOp.JumpOp : "block with successor must end with unconditional jump"; @@ -1636,7 +1636,7 @@ // before the branch instruction. So the split child information for this branch // would // be incorrect. - LIRInstruction instr = ir.lir(block).get(ir.lir(block).size() - 1); + LIRInstruction instr = ir.getLIRforBlock(block).get(ir.getLIRforBlock(block).size() - 1); if (instr instanceof StandardOp.JumpOp) { if (blockData.get(block).liveOut.get(operandNumber(operand))) { assert false : "can't get split child for the last branch of a block because the information would be incorrect (moves are inserted before the branch in resolveDataFlow)"; @@ -1752,7 +1752,7 @@ // are not // considered in the live ranges of intervals) // Solution: use the first opId of the branch target block instead. - final LIRInstruction instr = ir.lir(block).get(ir.lir(block).size() - 1); + final LIRInstruction instr = ir.getLIRforBlock(block).get(ir.getLIRforBlock(block).size() - 1); if (instr instanceof StandardOp.JumpOp) { if (blockData.get(block).liveOut.get(operandNumber(operand))) { tempOpId = getFirstLirInstructionId(block.getSuccessors().iterator().next()); @@ -1846,7 +1846,7 @@ try (Indent indent = Debug.logAndIndent("assign locations")) { for (AbstractBlock<?> block : sortedBlocks) { try (Indent indent2 = Debug.logAndIndent("assign locations in block B%d", block.getId())) { - assignLocations(ir.lir(block), iw); + assignLocations(ir.getLIRforBlock(block), iw); } } } @@ -2060,7 +2060,7 @@ IntervalWalker iw = new IntervalWalker(this, fixedIntervals, otherIntervals); for (AbstractBlock<?> block : sortedBlocks) { - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); for (int j = 0; j < instructions.size(); j++) { LIRInstruction op = instructions.get(j);
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScanWalker.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScanWalker.java Mon Mar 17 19:18:35 2014 +0100 @@ -244,7 +244,7 @@ // numbering of instructions is known. // When the block already contains spill moves, the index must be increased until the // correct index is reached. - List<LIRInstruction> instructions = allocator.ir.lir(opBlock); + List<LIRInstruction> instructions = allocator.ir.getLIRforBlock(opBlock); int index = (opId - instructions.get(0).id()) >> 1; assert instructions.get(index).id() <= opId : "error in calculation";
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/RegisterVerifier.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/RegisterVerifier.java Mon Mar 17 19:18:35 2014 +0100 @@ -106,7 +106,7 @@ } // process all operations of the block - processOperations(allocator.ir.lir(block), inputState); + processOperations(allocator.ir.getLIRforBlock(block), inputState); // iterate all successors for (AbstractBlock<?> succ : block.getSuccessors()) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Mon Mar 17 19:18:35 2014 +0100 @@ -142,7 +142,7 @@ if (index >= 0) { // Replace the move with a filler op so that the operation // list does not need to be adjusted. - List<LIRInstruction> instructions = lir.lir(block); + List<LIRInstruction> instructions = lir.getLIRforBlock(block); instructions.set(index, new NoOp(null, -1)); index = -1; } @@ -255,9 +255,9 @@ } LoadConstant load = constantLoads.get(value); if (load == null) { - int index = getLIR().lir(currentBlock).size(); + int index = getLIR().getLIRforBlock(currentBlock).size(); loadedValue = emitMove(value); - LIRInstruction op = getLIR().lir(currentBlock).get(index); + LIRInstruction op = getLIR().getLIRforBlock(currentBlock).get(index); constantLoads.put(value, new LoadConstant(loadedValue, currentBlock, index, op)); } else { Block dominator = ControlFlowGraph.commonDominator(load.block, currentBlock); @@ -265,7 +265,7 @@ if (dominator != load.block) { load.unpin(getLIR()); } else { - assert load.block != currentBlock || load.index < getLIR().lir(currentBlock).size(); + assert load.block != currentBlock || load.index < getLIR().getLIRforBlock(currentBlock).size(); } load.block = dominator; } @@ -406,7 +406,7 @@ TTY.println(); } assert LIRVerifier.verify(op); - getLIR().lir(currentBlock).add(op); + getLIR().getLIRforBlock(currentBlock).add(op); } public void doBlock(Block block, StructuredGraph graph, BlockMap<List<ScheduledNode>> blockMap) { @@ -417,8 +417,8 @@ currentBlock = block; // set up the list of LIR instructions - assert getLIR().lir(block) == null : "LIR list already computed for this block"; - getLIR().setLir(block, new ArrayList<LIRInstruction>()); + assert getLIR().getLIRforBlock(block) == null : "LIR list already computed for this block"; + getLIR().setLIRforBlock(block, new ArrayList<LIRInstruction>()); append(new LabelOp(new Label(block.getId()), block.isAligned())); @@ -489,7 +489,7 @@ protected abstract boolean peephole(ValueNode valueNode); private boolean hasBlockEnd(Block block) { - List<LIRInstruction> ops = getLIR().lir(block); + List<LIRInstruction> ops = getLIR().getLIRforBlock(block); if (ops.size() == 0) { return false; } @@ -546,7 +546,7 @@ } public void emitIncomingValues(Value[] params) { - ((LabelOp) getLIR().lir(currentBlock).get(0)).setIncomingValues(params); + ((LabelOp) getLIR().getLIRforBlock(currentBlock).get(0)).setIncomingValues(params); } @Override @@ -893,7 +893,7 @@ } if (lc.index != -1) { - assert getLIR().lir(lc.block).get(lc.index) == lc.op; + assert getLIR().getLIRforBlock(lc.block).get(lc.index) == lc.op; iter.remove(); } } @@ -914,7 +914,7 @@ } int groupSize = groupEnd - groupBegin; - List<LIRInstruction> ops = getLIR().lir(block); + List<LIRInstruction> ops = getLIR().getLIRforBlock(block); int lastIndex = ops.size() - 1; assert ops.get(lastIndex) instanceof BlockEndOp; int insertionIndex = lastIndex;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Mon Mar 17 19:18:35 2014 +0100 @@ -174,7 +174,7 @@ emitIncomingValues(params); - saveRbp = new SaveRbp(new NoOp(currentBlock, getLIR().lir(currentBlock).size())); + saveRbp = new SaveRbp(new NoOp(currentBlock, getLIR().getLIRforBlock(currentBlock).size())); append(saveRbp.placeholder); for (ParameterNode param : graph.getNodes(ParameterNode.class)) {
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Mon Mar 17 19:18:35 2014 +0100 @@ -374,7 +374,7 @@ // Emit .param arguments to kernel entry based on ParameterOp // instruction. - for (LIRInstruction op : lir.lir(startBlock)) { + for (LIRInstruction op : lir.getLIRforBlock(startBlock)) { if (op instanceof PTXParameterOp) { op.emitCode(crb); deleteOps.add(op); @@ -383,7 +383,7 @@ // Delete ParameterOp instructions. for (LIRInstruction op : deleteOps) { - lir.lir(startBlock).remove(op); + lir.getLIRforBlock(startBlock).remove(op); } // Start emiting body of the PTX kernel. @@ -399,7 +399,7 @@ RegisterAnalysis registerAnalysis = new RegisterAnalysis(); for (AbstractBlock<?> b : lir.codeEmittingOrder()) { - for (LIRInstruction op : lir.lir(b)) { + for (LIRInstruction op : lir.getLIRforBlock(b)) { if (op instanceof LabelOp) { // Don't consider this as a definition } else {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Mon Mar 17 19:18:35 2014 +0100 @@ -114,7 +114,7 @@ } }; for (AbstractBlock<?> block : lir.codeEmittingOrder()) { - for (LIRInstruction op : lir.lir(block)) { + for (LIRInstruction op : lir.getLIRforBlock(block)) { if (op instanceof LabelOp) { // Don't consider this as a definition } else {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Mon Mar 17 19:18:35 2014 +0100 @@ -58,12 +58,12 @@ return false; } - List<LIRInstruction> instructions = lir.lir(block); + List<LIRInstruction> instructions = lir.getLIRforBlock(block); assert instructions.size() >= 2 : "block must have label and branch"; assert instructions.get(0) instanceof StandardOp.LabelOp : "first instruction must always be a label"; assert instructions.get(instructions.size() - 1) instanceof StandardOp.JumpOp : "last instruction must always be a branch"; - assert ((StandardOp.JumpOp) instructions.get(instructions.size() - 1)).destination().label() == ((StandardOp.LabelOp) lir.lir(block.getSuccessors().iterator().next()).get(0)).getLabel() : "branch target must be the successor"; + assert ((StandardOp.JumpOp) instructions.get(instructions.size() - 1)).destination().label() == ((StandardOp.LabelOp) lir.getLIRforBlock(block.getSuccessors().iterator().next()).get(0)).getLabel() : "branch target must be the successor"; // Block must have exactly one successor. return instructions.size() == 2 && !instructions.get(instructions.size() - 1).hasState() && !block.isExceptionEntry(); @@ -72,7 +72,7 @@ private static void alignBlock(LIR lir, AbstractBlock<?> block) { if (!block.isAligned()) { block.setAlign(true); - List<LIRInstruction> instructions = lir.lir(block); + List<LIRInstruction> instructions = lir.getLIRforBlock(block); assert instructions.get(0) instanceof StandardOp.LabelOp : "first instruction must always be a label"; StandardOp.LabelOp label = (StandardOp.LabelOp) instructions.get(0); instructions.set(0, new StandardOp.LabelOp(label.getLabel(), true));
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Mon Mar 17 19:18:35 2014 +0100 @@ -120,8 +120,8 @@ // setup a list with the LIR instructions of all predecessors for (AbstractBlock<?> pred : block.getPredecessors()) { assert pred != null; - assert ir.lir(pred) != null; - List<LIRInstruction> predInstructions = ir.lir(pred); + assert ir.getLIRforBlock(pred) != null; + List<LIRInstruction> predInstructions = ir.getLIRforBlock(pred); if (pred.getSuccessorCount() != 1) { // this can happen with switch-statements where multiple edges are between @@ -158,7 +158,7 @@ } // insert the instruction at the beginning of the current block - ir.lir(block).add(1, op); + ir.getLIRforBlock(block).add(1, op); // delete the instruction at the end of all predecessors for (int i = 0; i < numPreds; i++) { @@ -178,7 +178,7 @@ edgeInstructionSeqences.clear(); int numSux = block.getSuccessorCount(); - List<LIRInstruction> instructions = ir.lir(block); + List<LIRInstruction> instructions = ir.getLIRforBlock(block); assert numSux == 2 : "method should not be called otherwise"; @@ -204,7 +204,7 @@ // setup a list with the lir-instructions of all successors for (AbstractBlock<?> sux : block.getSuccessors()) { - List<LIRInstruction> suxInstructions = ir.lir(sux); + List<LIRInstruction> suxInstructions = ir.getLIRforBlock(sux); assert suxInstructions.get(0) instanceof StandardOp.LabelOp : "block must start with label"; @@ -238,7 +238,7 @@ } // insert instruction at end of current block - ir.lir(block).add(insertIdx, op); + ir.getLIRforBlock(block).add(insertIdx, op); insertIdx++; // delete the instructions at the beginning of all successors
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Mon Mar 17 19:18:35 2014 +0100 @@ -81,7 +81,7 @@ */ public boolean hasDebugInfo() { for (AbstractBlock<?> b : linearScanOrder()) { - for (LIRInstruction op : lir(b)) { + for (LIRInstruction op : getLIRforBlock(b)) { if (op.hasState()) { return true; } @@ -94,12 +94,12 @@ return spillMoveFactory; } - public List<LIRInstruction> lir(AbstractBlock<?> block) { + public List<LIRInstruction> getLIRforBlock(AbstractBlock<?> block) { return lirInstructions.get(block); } - public void setLir(AbstractBlock<?> block, List<LIRInstruction> list) { - assert lir(block) == null : "lir instruction list should only be initialized once"; + public void setLIRforBlock(AbstractBlock<?> block, List<LIRInstruction> list) { + assert getLIRforBlock(block) == null : "lir instruction list should only be initialized once"; lirInstructions.put(block, list); } @@ -170,7 +170,7 @@ public static final int MAX_EXCEPTION_EDGE_OP_DISTANCE_FROM_END = 3; public static boolean verifyBlock(LIR lir, AbstractBlock<?> block) { - List<LIRInstruction> ops = lir.lir(block); + List<LIRInstruction> ops = lir.getLIRforBlock(block); if (ops.size() == 0) { return false; }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Mon Mar 17 19:18:35 2014 +0100 @@ -129,14 +129,14 @@ curVariablesLive.or(liveOutFor(block.getDominator())); } - assert lir.lir(block).get(0) instanceof StandardOp.LabelOp : "block must start with label"; + assert lir.getLIRforBlock(block).get(0) instanceof StandardOp.LabelOp : "block must start with label"; if (block.getSuccessorCount() > 0) { - LIRInstruction last = lir.lir(block).get(lir.lir(block).size() - 1); + LIRInstruction last = lir.getLIRforBlock(block).get(lir.getLIRforBlock(block).size() - 1); assert last instanceof StandardOp.JumpOp : "block with successor must end with unconditional jump"; } - for (LIRInstruction op : lir.lir(block)) { + for (LIRInstruction op : lir.getLIRforBlock(block)) { curInstruction = op; op.forEachInput(useProc);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LabelRef.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LabelRef.java Mon Mar 17 19:18:35 2014 +0100 @@ -73,7 +73,7 @@ } public Label label() { - return ((StandardOp.LabelOp) lir.lir(getTargetBlock()).get(0)).getLabel(); + return ((StandardOp.LabelOp) lir.getLIRforBlock(getTargetBlock()).get(0)).getLabel(); } @Override
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Mon Mar 17 19:18:35 2014 +0100 @@ -40,7 +40,7 @@ private static void foldNullChecks(LIR ir, List<? extends AbstractBlock<?>> blocks, int implicitNullCheckLimit) { for (AbstractBlock<?> block : blocks) { - List<LIRInstruction> list = ir.lir(block); + List<LIRInstruction> list = ir.getLIRforBlock(block); if (!list.isEmpty()) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Mon Mar 17 19:18:35 2014 +0100 @@ -144,7 +144,7 @@ * which occur as destinations of move instructions. */ for (AbstractBlock<?> block : blocks) { - List<LIRInstruction> instructions = lir.lir(block); + List<LIRInstruction> instructions = lir.getLIRforBlock(block); for (LIRInstruction op : instructions) { if (isEligibleMove(op)) { Value dest = ((MoveOp) op).getResult(); @@ -244,7 +244,7 @@ */ int[] iterState = data.exitState; copyState(iterState, data.entryState); - List<LIRInstruction> instructions = lir.lir(block); + List<LIRInstruction> instructions = lir.getLIRforBlock(block); for (LIRInstruction op : instructions) { valueNum = updateState(iterState, op, valueNum); @@ -287,7 +287,7 @@ Indent indent2 = indent.logAndIndent("eliminate moves in block %d", block.getId()); - List<LIRInstruction> instructions = lir.lir(block); + List<LIRInstruction> instructions = lir.getLIRforBlock(block); BlockData data = blockData.get(block); boolean hasDead = false;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Mon Mar 17 19:18:35 2014 +0100 @@ -195,7 +195,7 @@ } public void replace(LIR lir, LIRInstruction replacement) { - lir.lir(block).set(index, replacement); + lir.getLIRforBlock(block).set(index, replacement); } @Override
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Mon Mar 17 19:18:35 2014 +0100 @@ -325,7 +325,7 @@ blockComment(String.format("block B%d %s", block.getId(), block.getLoop())); } - for (LIRInstruction op : lir.lir(block)) { + for (LIRInstruction op : lir.getLIRforBlock(block)) { if (Debug.isDumpEnabled()) { blockComment(String.format("%d %s", op.id(), op)); }
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Mon Mar 17 19:11:27 2014 +0100 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Mon Mar 17 19:18:35 2014 +0100 @@ -423,7 +423,7 @@ if (lir == null) { return; } - List<LIRInstruction> lirInstructions = lir.lir(block); + List<LIRInstruction> lirInstructions = lir.getLIRforBlock(block); if (lirInstructions == null) { return; }