# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1366979998 -7200
# Node ID eeb046e7e7da1bfb471d4a7cb7cb1be4f94a0935
# Parent  ea24896c95c95d3daa3926b8a8de2de9eb3c925a# Parent  1f4f33291099da3e860b335c046520e83bd29605
Merge.

diff -r 1f4f33291099 -r eeb046e7e7da graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Fri Apr 26 14:14:14 2013 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Fri Apr 26 14:39:58 2013 +0200
@@ -282,6 +282,7 @@
             if (!SnippetTemplate.hasConstantParameter(method)) {
                 NodeIntrinsificationVerificationPhase.verify(graph);
             }
+            new ConvertDeoptimizeToGuardPhase().apply(graph);
 
             if (original == null) {
                 new SnippetFrameStateCleanupPhase().apply(graph);
diff -r 1f4f33291099 -r eeb046e7e7da mx/sanitycheck.py
--- a/mx/sanitycheck.py	Fri Apr 26 14:14:14 2013 +0200
+++ b/mx/sanitycheck.py	Fri Apr 26 14:39:58 2013 +0200
@@ -47,7 +47,8 @@
 }
 
 dacapoScalaSanityWarmup = {
-    'actors':     [0, 0, 2,  8, 10],
+# (tw) actors sometimes fails verification; hardly reproducible
+    'actors':     [0, 0, 0,  0,  0],
 # (lstadler) apparat was disabled due to a deadlock which I think is the benchmarks fault.
     'apparat':    [0, 0, 0,  0,  0],
     'factorie':   [0, 0, 2,  5,  5],