Mercurial > hg > graal-jvmci-8

changeset 6308:1bb742086acd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 03 Sep 2012 12:52:41 +0200
parents d7f67808f970 (diff) 94ed0ba0a1f2 (current diff)
children 6f8b6fc03c96
files graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/LoadSnippetParameterNode.java
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ReadEliminationPhase.java	Fri Aug 31 22:56:29 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ReadEliminationPhase.java	Mon Sep 03 12:52:41 2012 +0200
@@ -27,6 +27,7 @@
 import com.oracle.graal.debug.*;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.PhiNode.PhiType;
 import com.oracle.graal.nodes.extended.*;
 
 public class ReadEliminationPhase extends Phase {
@@ -81,7 +82,10 @@
             return exisiting;
         }
         if (lastLocationAccess instanceof ValueProxyNode) {
-            return getValue(n, ((ValueProxyNode) lastLocationAccess).value(), nodeMap);
+            ValueProxyNode proxy = (ValueProxyNode) lastLocationAccess;
+            ValueNode value = getValue(n, proxy.value(), nodeMap);
+            assert proxy.type() == PhiType.Value;
+            return lastLocationAccess.graph().add(new ValueProxyNode(value, proxy.proxyPoint(), PhiType.Value));
         }
         if (lastLocationAccess instanceof WriteNode) {
             return ((WriteNode) lastLocationAccess).value();
--- a/mx/commands.py	Fri Aug 31 22:56:29 2012 +0200
+++ b/mx/commands.py	Mon Sep 03 12:52:41 2012 +0200
@@ -357,6 +357,12 @@
     ENDTOKEN = 'RUNINDEBUGSHELL_ENDSEQUENCE'
 
     winSDK = mx.get_env('WIN_SDK', 'C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\')
+    
+    if not exists(winSDK):
+        mx.abort("Could not find Windows SDK : '" + winSDK + "' does not exist")
+        
+    if not exists(join(winSDK, 'Bin', 'SetEnv.cmd')):
+        mx.abort("Invalid Windows SDK path (" + winSDK + ") : could not find Bin/SetEnv.cmd (you can use the WIN_SDK environment variable to specify an other path)")
 
     p = subprocess.Popen('cmd.exe /E:ON /V:ON /K ""' + winSDK + '/Bin/SetEnv.cmd" & echo ' + STARTTOKEN + '"', \
             shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)