Mercurial > hg > graal-compiler
changeset 7330:1003fde9b882
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 10 Jan 2013 15:29:52 +0100 |
parents | 077a56735ce3 (current diff) 6939a5af19d5 (diff) |
children | 88b3b9b9a47b |
files | |
diffstat | 8 files changed, 21 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Thu Jan 10 15:29:52 2013 +0100 @@ -428,6 +428,7 @@ originalFalseSuccessor.prepareDelete(); FixedNode next = merge.next(); + FrameState state = merge.stateAfter(); merge.setNext(null); setTrueSuccessor(null); setFalseSuccessor(null); @@ -438,6 +439,9 @@ merge.safeDelete(); trueEnd.safeDelete(); falseEnd.safeDelete(); + if (state != null) { + tool.removeIfUnused(state); + } tool.addToWorkList(next); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Thu Jan 10 15:29:52 2013 +0100 @@ -97,6 +97,8 @@ Map<Object, Object> debugProperties = super.getDebugProperties(map); if (callTarget instanceof MethodCallTargetNode && methodCallTarget().targetMethod() != null) { debugProperties.put("targetMethod", methodCallTarget().targetMethod()); + } else if (callTarget instanceof AbstractCallTargetNode) { + debugProperties.put("targetMethod", ((AbstractCallTargetNode) callTarget).target()); } return debugProperties; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/CanonicalizerTool.java Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/CanonicalizerTool.java Thu Jan 10 15:29:52 2013 +0100 @@ -24,10 +24,12 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; +import com.oracle.graal.graph.*; public interface CanonicalizerTool { TargetDescription target(); Assumptions assumptions(); MetaAccessProvider runtime(); + void removeIfUnused(Node node); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Thu Jan 10 15:29:52 2013 +0100 @@ -341,5 +341,10 @@ public void addToWorkList(Node node) { nodeWorkSet.addAgain(node); } + + @Override + public void removeIfUnused(Node node) { + tryKillUnused(node); + } } }
--- a/graal/com.oracle.truffle.codegen.processor/src/META-INF/services/javax.annotation.processing.Processor Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.truffle.codegen.processor/src/META-INF/services/javax.annotation.processing.Processor Thu Jan 10 15:29:52 2013 +0100 @@ -1,1 +1,1 @@ -com.oracle.truffle.codegen.processor.TruffleProcessor \ No newline at end of file +com.oracle.truffle.codegen.processor.TruffleProcessor
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.frame Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.frame Thu Jan 10 15:29:52 2013 +0100 @@ -46,7 +46,7 @@ public final Scanner scanner; public final Errors errors; private final NodeFactory factory; - -->declarations + -->declarations public Parser(Scanner scanner, NodeFactory factory) { this.scanner = scanner; this.factory = factory;
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Scanner.frame Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Scanner.frame Thu Jan 10 15:29:52 2013 +0100 @@ -403,7 +403,7 @@ NextCh(); } } - + -->comments void CheckLiteral() { @@ -418,7 +418,7 @@ Token NextToken() { while (ch == ' ' || -->scan1 - ) NextCh(); + ) NextCh(); -->scan2 int recKind = noSym; int recEnd = pos;
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SimpleLanguage.atg Thu Jan 10 15:29:42 2013 +0100 +++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SimpleLanguage.atg Thu Jan 10 15:29:52 2013 +0100 @@ -28,7 +28,7 @@ = Function { - Function + Function } . @@ -86,7 +86,7 @@ } ";" (. result = factory.createPrint(expressions); .) . - + ReturnStatement<out StatementNode result> = "return" @@ -97,8 +97,8 @@ = ValueExpression<out result> [ - ("<" | ">" | "<=" | ">=" | "==" | "!=" ) (. String op = t.val; .) - ValueExpression<out TypedNode right> (. result = factory.createBinary(op, result, right); .) + ("<" | ">" | "<=" | ">=" | "==" | "!=" ) (. String op = t.val; .) + ValueExpression<out TypedNode right> (. result = factory.createBinary(op, result, right); .) ] .