# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1335351817 -7200
# Node ID f1585764a3dad92cdbe22b45897222a57e733ee6
# Parent  0ebd9cfdc11f185dc951011abe59b9364b02de2c# Parent  60e658e50fceac852b681a20ce4206acb9e520a1
Merge

diff -r 0ebd9cfdc11f -r f1585764a3da graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java
--- 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) {
diff -r 0ebd9cfdc11f -r f1585764a3da graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java
--- 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);
diff -r 0ebd9cfdc11f -r f1585764a3da mx/commands.py
--- a/mx/commands.py	Wed Apr 25 13:02:10 2012 +0200
+++ b/mx/commands.py	Wed Apr 25 13:03:37 2012 +0200
@@ -916,6 +916,9 @@
     wt = None
     it = None
     skipValid = False
+    if '-v' in vmArgs:
+        vmArgs.remove('-v')
+        benchArgs.append('-v')
     if '-ikv' in vmArgs:
         skipValid = True
         vmArgs.remove('-ikv')