Mercurial > hg > truffle
changeset 5300:f1585764a3da
Merge
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Wed, 25 Apr 2012 13:03:37 +0200 |
parents | 0ebd9cfdc11f (current diff) 60e658e50fce (diff) |
children | 23ea81293bd5 |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java |
diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java Wed Apr 25 13:02:10 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java Wed Apr 25 13:03:37 2012 +0200 @@ -94,7 +94,7 @@ } static String createGlobString(String pattern) { - return pattern.replace("\\", "\\\\").replace(".", "\\.").replace('?', '.').replace("*", ".*").replace("[", "\\[").replace("]", "\\]"); + return Pattern.quote(pattern).replace("?", "\\E.\\Q").replace("*", "\\E.*\\Q"); } private static Pattern createClassGlobPattern(String pattern) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Apr 25 13:02:10 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Apr 25 13:03:37 2012 +0200 @@ -117,7 +117,7 @@ tool.addToWorkList(falseSuccessor()); ((StructuredGraph) graph()).removeSplit(this, FALSE_EDGE); } - } else { + } else if (trueSuccessor().guards().isEmpty() && falseSuccessor().guards().isEmpty()) { if (trueSuccessor().next() instanceof EndNode && falseSuccessor().next() instanceof EndNode) { EndNode trueEnd = (EndNode) trueSuccessor().next(); EndNode falseEnd = (EndNode) falseSuccessor().next(); @@ -165,6 +165,8 @@ MergeNode merge = trueEnd.merge(); merge.prepareDelete(pred); assert merge.usages().isEmpty(); + trueSuccessor.prepareDelete(); + falseSuccessor.prepareDelete(); FixedNode next = merge.next(); merge.setNext(null);