# HG changeset patch
# User Michael Haupt <michael.haupt@oracle.com>
# Date 1407599461 25200
# Node ID 7d7fae9e9d1716afe9aef4f3d7df32c54e97c126
# Parent  444ef6194ce3c1d6c39aaa2cf38b03807e0b53fd# Parent  c958f16fd52f52137ede06404bd9747c794eb09f
merge

diff -r 444ef6194ce3 -r 7d7fae9e9d17 graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Services.java
--- a/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Services.java	Fri Aug 08 10:44:37 2014 -0700
+++ b/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Services.java	Sat Aug 09 08:51:01 2014 -0700
@@ -56,7 +56,7 @@
                 // Fall back to standard SerivceLoader
             }
         }
-        return ServiceLoader.loadInstalled(service);
+        return ServiceLoader.load(service, Services.class.getClassLoader());
     }
 
     private static native <S> S[] getServiceImpls(Class<?> service);
diff -r 444ef6194ce3 -r 7d7fae9e9d17 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java	Fri Aug 08 10:44:37 2014 -0700
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java	Sat Aug 09 08:51:01 2014 -0700
@@ -123,6 +123,8 @@
                                 StructuredGraph graph = new StructuredGraph(metaAccess.lookupJavaMethod(m));
                                 try (DebugConfigScope s = Debug.setConfig(new DelegatingDebugConfig().disable(INTERCEPT))) {
                                     graphBuilderSuite.apply(graph, context);
+                                    // update phi stamps
+                                    graph.getNodes().filter(PhiNode.class).forEach(PhiNode::inferStamp);
                                     checkGraph(context, graph);
                                 } catch (VerificationError e) {
                                     errors.add(e.getMessage());
diff -r 444ef6194ce3 -r 7d7fae9e9d17 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/CompilerThread.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/CompilerThread.java	Fri Aug 08 10:44:37 2014 -0700
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/CompilerThread.java	Sat Aug 09 08:51:01 2014 -0700
@@ -44,6 +44,7 @@
     @Override
     public void run() {
         GraalDebugConfig debugConfig = debugConfigAccess.getDebugConfig();
+        setContextClassLoader(getClass().getClassLoader());
         try {
             super.run();
         } finally {
diff -r 444ef6194ce3 -r 7d7fae9e9d17 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java	Fri Aug 08 10:44:37 2014 -0700
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java	Sat Aug 09 08:51:01 2014 -0700
@@ -149,12 +149,12 @@
 
         // Warm up and initialize compiler phases used by this compilation
         for (int i = 0; i < 10; i++) {
-            try (MemoryUsageCloseable c = verbose ? new MemoryUsageCloseable(methodName + "[" + i + "]") : null) {
+            try (MemoryUsageCloseable c = verbose ? new MemoryUsageCloseable(methodName + "[warmup-" + i + "]") : null) {
                 doCompilation(methodName);
             }
         }
 
-        try (MemoryUsageCloseable c = new MemoryUsageCloseable(methodName + "[warm]")) {
+        try (MemoryUsageCloseable c = new MemoryUsageCloseable(methodName)) {
             doCompilation(methodName);
         }
     }
diff -r 444ef6194ce3 -r 7d7fae9e9d17 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java	Fri Aug 08 10:44:37 2014 -0700
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java	Sat Aug 09 08:51:01 2014 -0700
@@ -24,6 +24,7 @@
 
 import java.util.*;
 
+import com.oracle.graal.api.runtime.*;
 import com.oracle.graal.options.*;
 
 /**
@@ -36,8 +37,7 @@
      * Initializes {@link #options} from {@link Options} services.
      */
     static {
-        ServiceLoader<Options> sl = ServiceLoader.load(Options.class);
-        for (Options opts : sl) {
+        for (Options opts : Services.load(Options.class)) {
             for (OptionDescriptor desc : opts) {
                 if (isHotSpotOption(desc)) {
                     String name = desc.getName();
diff -r 444ef6194ce3 -r 7d7fae9e9d17 graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Fri Aug 08 10:44:37 2014 -0700
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Sat Aug 09 08:51:01 2014 -0700
@@ -39,7 +39,7 @@
  * retrieved as follows:
  *
  * <pre>
- * ServiceLoader&lt;Options&gt; sl = ServiceLoader.loadInstalled(Options.class);
+ * ServiceLoader&lt;Options&gt; sl = ServiceLoader.load(Options.class);
  * for (Options opts : sl) {
  *     for (OptionDescriptor desc : sl) {
  *         // use desc
diff -r 444ef6194ce3 -r 7d7fae9e9d17 mx/mx_graal.py
--- a/mx/mx_graal.py	Fri Aug 08 10:44:37 2014 -0700
+++ b/mx/mx_graal.py	Sat Aug 09 08:51:01 2014 -0700
@@ -1543,10 +1543,10 @@
 
 def maven_install_truffle(args):
     """install Truffle into your local Maven repository"""
-    mx.archive(["@TRUFFLE"])
-    mx.run(['mvn', 'install:install-file', '-DgroupId=com.oracle', '-DartifactId=truffle', '-Dversion=' + graal_version('SNAPSHOT'), '-Dpackaging=jar', '-Dfile=build/truffle.jar'])
-    mx.archive(["@TRUFFLE-DSL-PROCESSOR"])
-    mx.run(['mvn', 'install:install-file', '-DgroupId=com.oracle', '-DartifactId=truffle-dsl-processor', '-Dversion=' + graal_version('SNAPSHOT'), '-Dpackaging=jar', '-Dfile=build/truffle-dsl-processor.jar'])
+    for name in ['TRUFFLE', 'TRUFFLE-DSL-PROCESSOR']:
+        mx.archive(["@" + name])
+        path = mx._dists[name].path
+        mx.run(['mvn', 'install:install-file', '-DgroupId=com.oracle', '-DartifactId=' + name.lower(), '-Dversion=' + graal_version('SNAPSHOT'), '-Dpackaging=jar', '-Dfile=' + path])
 
 def c1visualizer(args):
     """run the Cl Compiler Visualizer"""