Mercurial > hg > truffle

changeset 19381:31442a6da26d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid diamond shape for methods that return a condition.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 15 Feb 2015 16:00:58 +0100
parents 9220566922ab
children 37516af640ed
files graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
diffstat 1 files changed, 44 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Sun Feb 15 15:28:26 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Sun Feb 15 16:00:58 2015 +0100
@@ -1001,10 +1001,10 @@
 
             @Override
             protected void genReturn(ValueNode x) {
-                frameState.setRethrowException(false);
-                frameState.clearStack();
 
                 if (this.currentDepth == 0) {
+                    frameState.setRethrowException(false);
+                    frameState.clearStack();
                     beforeReturn(x);
                     append(new ReturnNode(x));
                 } else {
@@ -1014,6 +1014,8 @@
                         this.beforeReturnNode = this.lastInstr;
                         this.lastInstr = null;
                     } else {
+                        frameState.setRethrowException(false);
+                        frameState.clearStack();
                         if (x != null) {
                             frameState.push(x.getKind(), x);
                         }
@@ -1717,12 +1719,22 @@
                         condition = currentGraph.unique(condition);
                     }
 
-                    if (trueBlock.getSuccessorCount() == 1 && falseBlock.getSuccessorCount() == 1 && trueBlock.getSuccessor(0) == falseBlock.getSuccessor(0)) {
-                        int oldBci = stream.currentBCI();
-                        int trueBlockInt = checkPositiveIntConstantPushed(trueBlock);
-                        if (trueBlockInt != -1) {
-                            int falseBlockInt = checkPositiveIntConstantPushed(falseBlock);
-                            if (falseBlockInt != -1) {
+                    int oldBci = stream.currentBCI();
+                    int trueBlockInt = checkPositiveIntConstantPushed(trueBlock);
+                    if (trueBlockInt != -1) {
+                        int falseBlockInt = checkPositiveIntConstantPushed(falseBlock);
+                        if (falseBlockInt != -1) {
+
+                            boolean genReturn = false;
+                            boolean genConditional = false;
+                            if (gotoOrFallThroughAfterConstant(trueBlock) && gotoOrFallThroughAfterConstant(falseBlock) && trueBlock.getSuccessor(0) == falseBlock.getSuccessor(0)) {
+                                genConditional = true;
+                            } else if (this.currentDepth != 0 && returnAfterConstant(trueBlock) && returnAfterConstant(falseBlock)) {
+                                genReturn = true;
+                                genConditional = true;
+                            }
+
+                            if (genConditional) {
                                 ConstantNode trueValue = currentGraph.unique(ConstantNode.forInt(trueBlockInt));
                                 ConstantNode falseValue = currentGraph.unique(ConstantNode.forInt(falseBlockInt));
                                 if (negate) {
@@ -1734,9 +1746,13 @@
                                 if (conditionalNode.graph() == null) {
                                     conditionalNode = currentGraph.addOrUnique(conditionalNode);
                                 }
-                                frameState.push(Kind.Int, conditionalNode);
-                                appendGoto(trueBlock.getSuccessor(0));
-                                stream.setBCI(oldBci);
+                                if (genReturn) {
+                                    this.genReturn(conditionalNode);
+                                } else {
+                                    frameState.push(Kind.Int, conditionalNode);
+                                    appendGoto(trueBlock.getSuccessor(0));
+                                    stream.setBCI(oldBci);
+                                }
                                 return;
                             }
                         }
@@ -1756,16 +1772,27 @@
                 int currentBC = stream.currentBC();
                 if (currentBC >= Bytecodes.ICONST_0 && currentBC <= Bytecodes.ICONST_5) {
                     int constValue = currentBC - Bytecodes.ICONST_0;
-                    int currentBCI = stream.nextBCI();
-                    stream.setBCI(currentBCI);
-                    currentBC = stream.currentBC();
-                    if (stream.currentBCI() > block.endBci || currentBC == Bytecodes.GOTO || currentBC == Bytecodes.GOTO_W) {
-                        return constValue;
-                    }
+                    return constValue;
                 }
                 return -1;
             }
 
+            private boolean gotoOrFallThroughAfterConstant(BciBlock block) {
+                stream.setBCI(block.startBci);
+                int currentBCI = stream.nextBCI();
+                stream.setBCI(currentBCI);
+                int currentBC = stream.currentBC();
+                return stream.currentBCI() > block.endBci || currentBC == Bytecodes.GOTO || currentBC == Bytecodes.GOTO_W;
+            }
+
+            private boolean returnAfterConstant(BciBlock block) {
+                stream.setBCI(block.startBci);
+                int currentBCI = stream.nextBCI();
+                stream.setBCI(currentBCI);
+                int currentBC = stream.currentBC();
+                return currentBC == Bytecodes.IRETURN;
+            }
+
             public StampProvider getStampProvider() {
                 return stampProvider;
             }