truffle: graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java comparison

comparison graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java @ 2823:ac4b086cbd72

Merge

author	Gilles Duboscq <gilles.duboscq@oracle.com>
date	Mon, 30 May 2011 16:35:08 +0200
parents	530366123e46 d27bdbec3d67
children	9ba6a8abe894

comparison

equal deleted inserted replaced

-:530366123e46
+:ac4b086cbd72
 constants = new ArrayList<CiConstant>();
 variablesForConstants = new ArrayList<CiVariable>();
 this.operands = new OperandPool(compilation.target);
-new PhiSimplifier(ir);
 }
 public ArrayList<DeoptimizationStub> deoptimizationStubs() {
 return deoptimizationStubs;
 }
 if (C1XOptions.TraceLIRGeneratorLevel >= 1) {
 TTY.println("BEGIN Generating LIR for block B" + block.blockID());
 }
-for (Instruction instr : block.getInstructions()) {
+if (block.blockPredecessors().size() > 1) {
-FrameState stateAfter = instr.stateAfter();
+lastState = null;
+}
+for (Node instr : block.getInstructions()) {
+FrameState stateAfter = null;
+if (instr instanceof Instruction) {
+stateAfter = ((Instruction) instr).stateAfter();
+}
 FrameState stateBefore = null;
 if (instr instanceof StateSplit && ((StateSplit) instr).stateBefore() != null) {
 stateBefore = ((StateSplit) instr).stateBefore();
 }
 if (stateBefore != null) {
 if (C1XOptions.TraceLIRGeneratorLevel >= 3) {
 TTY.println(stateBefore.toString());
 }
 }
 }
-if (!(instr instanceof Merge)) {
+if (!(instr instanceof Merge) && instr != instr.graph().start()) {
 walkState(instr, stateAfter);
-doRoot(instr);
+doRoot((Value) instr);
 }
 if (stateAfter != null) {
 lastState = stateAfter;
 if (C1XOptions.TraceLIRGeneratorLevel >= 2) {
 TTY.println("STATE CHANGE");
 block.setLastState(lastState);
 this.currentBlock = null;
 blockDoEpilog();
 }
-private static boolean jumpsToNextBlock(Instruction instr) {
+private static boolean jumpsToNextBlock(Node node) {
-return instr instanceof BlockEnd;
+return node instanceof BlockEnd;
 }
 @Override
 public void visitArrayLength(ArrayLength x) {
 emitArrayLength(x);
 return item.result();
 }
 }
 }
-protected CiValue emitXir(XirSnippet snippet, Instruction x, LIRDebugInfo info, RiMethod method, boolean setInstructionResult) {
+protected CiValue emitXir(XirSnippet snippet, Value x, LIRDebugInfo info, RiMethod method, boolean setInstructionResult) {
 return emitXir(snippet, x, info, null, method, setInstructionResult, null);
 }
-protected CiValue emitXir(XirSnippet snippet, Instruction instruction, LIRDebugInfo info, LIRDebugInfo infoAfter, RiMethod method, boolean setInstructionResult, List<CiValue> pointerSlots) {
+protected CiValue emitXir(XirSnippet snippet, Value instruction, LIRDebugInfo info, LIRDebugInfo infoAfter, RiMethod method, boolean setInstructionResult, List<CiValue> pointerSlots) {
 if (C1XOptions.PrintXirTemplates) {
 TTY.println("Emit XIR template " + snippet.template.name);
 }
 final CiValue[] operands = new CiValue[snippet.template.variableCount];
 }
 }
 return res.toArray(new SwitchRange[res.size()]);
 }
-void doRoot(Instruction instr) {
+void doRoot(Value instr) {
 if (C1XOptions.TraceLIRGeneratorLevel >= 2) {
-TTY.println("Emitting LIR for instruction " + instr.toString());
+TTY.println("Emitting LIR for instruction " + instr);
 }
 currentInstruction = instr;
-assert !instr.hasSubst() : "shouldn't have missed substitution";
 if (C1XOptions.TraceLIRVisit) {
 TTY.println("Visiting    " + instr);
 }
 instr.accept(this);
 }
 }
 private List<Phi> getPhis(LIRBlock block) {
 if (block.getInstructions().size() > 0) {
-Instruction i = block.getInstructions().get(0);
+Node i = block.firstInstruction();
 if (i instanceof Merge) {
 List<Phi> result = new ArrayList<Phi>();
 for (Node n : i.usages()) {
 if (n instanceof Phi) {
 result.add((Phi) n);
 default:
 Util.shouldNotReachHere();
 }
 }
-protected void walkState(Instruction x, FrameState state) {
+protected void walkState(Node x, FrameState state) {
 if (state == null) {
 return;
 }
 for (int index = 0; index < state.stackSize(); index++) {
 Value value = state.stackAt(index);
 }
 }
 private void walkStateValue(Value value) {
 if (value != null) {
-assert !value.hasSubst() : "missed substitution on " + value.toString();
 if (value instanceof Phi && !value.isIllegal()) {
 // phi's are special
 operandForPhi((Phi) value);
 } else if (value.operand().isIllegal()) {
 // instruction doesn't have an operand yet
 assert operand.isLegal() : "must be evaluated now";
 }
 }
 }
-protected LIRDebugInfo stateFor(Instruction x) {
+protected LIRDebugInfo stateFor(Value x) {
 assert lastState != null : "must have state before instruction for " + x;
 return stateFor(x, lastState);
 }
-protected LIRDebugInfo stateFor(Instruction x, FrameState state) {
+protected LIRDebugInfo stateFor(Value x, FrameState state) {
 if (compilation.placeholderState != null) {
 state = compilation.placeholderState;
 }
 assert state != null;
 } else if (instruction instanceof Constant) {
 operand = operandForInstruction(instruction);
 }
 }
 // the value must be a constant or have a valid operand
-assert operand.isLegal() : "this root has not been visited yet";
+assert operand.isLegal() : "this root has not been visited yet; instruction=" + instruction;
 return operand;
 }
 /**
 * Gets the ABI specific operand used to return a value of a given kind from a method.

Mercurial > hg > truffle

comparison graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java @ 2823:ac4b086cbd72