Mercurial > hg > graal-compiler

changeset 22246:73366ceb98a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updating to 0.9-SNAPSHOT of Truffle that requires RootNode to be associated with a TruffleLanguage
author Jaroslav Tulach <jaroslav.tulach@oracle.com>
date Mon, 20 Jul 2015 13:57:51 +0200
parents bdfbff780167
children 653e85bc19a0
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedOSRLoopNode.java mx.graal/suite.py mxtool/mx.py
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedOSRLoopNode.java	Mon Jul 20 04:21:24 2015 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedOSRLoopNode.java	Mon Jul 20 13:57:51 2015 +0200
@@ -183,7 +183,7 @@
         @Child private OptimizedOSRLoopNode loopNode;
 
         public OSRRootNode(OptimizedOSRLoopNode loop) {
-            super(loop.getSourceSection(), loop.getRootNode().getFrameDescriptor());
+            super(TruffleLanguage.class, loop.getSourceSection(), loop.getRootNode().getFrameDescriptor());
             this.loopNode = loop;
         }
 
--- a/mx.graal/suite.py	Mon Jul 20 04:21:24 2015 +0200
+++ b/mx.graal/suite.py	Mon Jul 20 13:57:51 2015 +0200
@@ -95,27 +95,27 @@
     # ------------- Truffle -------------
 
     "TRUFFLE" : {
-      "path" : "lib/truffle-0.8-SNAPSHOT.jar",
+      "path" : "lib/truffle-0.9-SNAPSHOT.jar",
       "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/com/oracle/truffle-api/0.8-397164a68abffa1e934a581ead91cd882eaae954-SNAPSHOT/truffle-api-0.8-397164a68abffa1e934a581ead91cd882eaae954-20150713.145252-1.jar",
+        "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/com/oracle/truffle-api/0.9-5bc7f7b867abc0cc464205d8884d6a20e21c803b-SNAPSHOT/truffle-api-0.9-5bc7f7b867abc0cc464205d8884d6a20e21c803b-20150718.160556-1.jar",
       ],
-      "sha1" : "969c49cb04fb7acfbd20892579847ca8d80f4235",
+      "sha1" : "5b13fb55d78d9bd00efbd9b8ea5583fe32259c4a",
     },
     "TRUFFLE_DSL_PROCESSOR" : {
-      "path" : "lib/truffle-dsl-processor-0.8-SNAPSHOT.jar",
+      "path" : "lib/truffle-dsl-processor-0.9-SNAPSHOT.jar",
       "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/com/oracle/truffle-dsl-processor/0.8-397164a68abffa1e934a581ead91cd882eaae954-SNAPSHOT/truffle-dsl-processor-0.8-397164a68abffa1e934a581ead91cd882eaae954-20150713.145255-1.jar"
+        "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/com/oracle/truffle-dsl-processor/0.9-5bc7f7b867abc0cc464205d8884d6a20e21c803b-SNAPSHOT/truffle-dsl-processor-0.9-5bc7f7b867abc0cc464205d8884d6a20e21c803b-20150718.160558-1.jar"
       ],
-      "sha1" : "39ddec960e0e463284b1cc6783cda11dcc80f939",
+      "sha1" : "92e7d01277bad6165d3f263e05215dd3477a20f4",
       "annotationProcessor" : "true",
       "dependencies" : ["TRUFFLE"]
     },
     "TRUFFLE_SL" : {
-      "path" : "lib/truffle-sl-0.8-SNAPSHOT.jar",
+      "path" : "lib/truffle-sl-0.9-SNAPSHOT.jar",
       "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/com/oracle/truffle-sl/0.8-397164a68abffa1e934a581ead91cd882eaae954-SNAPSHOT/truffle-sl-0.8-397164a68abffa1e934a581ead91cd882eaae954-20150713.145259-1.jar",
+        "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/com/oracle/truffle-sl/0.9-5bc7f7b867abc0cc464205d8884d6a20e21c803b-SNAPSHOT/truffle-sl-0.9-5bc7f7b867abc0cc464205d8884d6a20e21c803b-20150718.160603-1.jar",
       ],
-      "sha1" : "9ffddd8f3659955bb34a018a540603c2391d2115",
+      "sha1" : "3ca368465d187b67cfd84f828fa91b7496b3949f",
     }
   },
 
--- a/mxtool/mx.py	Mon Jul 20 04:21:24 2015 +0200
+++ b/mxtool/mx.py	Mon Jul 20 13:57:51 2015 +0200
@@ -647,7 +647,7 @@
         return self._annotationProcessors
 
     """
-    Gets the class path composed of the distribution jars containing the 
+    Gets the class path composed of the distribution jars containing the
     annotation processors that will be applied when compiling this project.
     """
     def annotation_processors_path(self):
@@ -800,7 +800,7 @@
 that may use functionality in one JRE (e.g., Oracle JRE)
 that is not present in another JRE (e.g., OpenJDK). A
 motivating example is the Java Flight Recorder library
-found in the Oracle JRE. 
+found in the Oracle JRE.
 """
 class JreLibrary(BaseLibrary):
     def __init__(self, suite, name, jar, optional):