Mercurial > hg > graal-compiler
changeset 22420:13ea85f171d3
Updating to latest version of Truffle API
author | Jaroslav Tulach <jaroslav.tulach@oracle.com> |
---|---|
date | Thu, 06 Aug 2015 18:57:34 +0200 |
parents | 92ead19b1c4a |
children | 440c505123b4 |
files | graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/MockLanguage.java graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java mx.graal/mx_graal.py mx.graal/suite.py |
diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/MockLanguage.java Wed Aug 05 01:03:28 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/MockLanguage.java Thu Aug 06 18:57:34 2015 +0200 @@ -24,8 +24,8 @@ import com.oracle.truffle.api.TruffleLanguage; -public abstract class MockLanguage extends TruffleLanguage { - public MockLanguage(Env env) { - super(env); +public abstract class MockLanguage extends TruffleLanguage<Object> { + public MockLanguage() { + super(); } }
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java Wed Aug 05 01:03:28 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java Thu Aug 06 18:57:34 2015 +0200 @@ -28,7 +28,6 @@ import com.oracle.truffle.api.nodes.*; import com.oracle.truffle.api.source.*; import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.nodes.*; import com.oracle.truffle.sl.runtime.*; /** @@ -41,7 +40,8 @@ @Specialization public SLNull runTests(VirtualFrame frame, String startsWith, SLFunction harness) { - SLContext context = ((SLRootNode) getRootNode()).getSLContext(); + Node n = SLLanguage.INSTANCE.createFindContextNode0(); + SLContext context = SLLanguage.INSTANCE.findContext0(n); boolean found = false; for (SLFunction function : context.getFunctionRegistry().getFunctions()) { if (function.getName().startsWith(startsWith) && getSource(function) == getSource(harness) && getSource(function) != null) {
--- a/mx.graal/mx_graal.py Wed Aug 05 01:03:28 2015 +0200 +++ b/mx.graal/mx_graal.py Thu Aug 06 18:57:34 2015 +0200 @@ -86,7 +86,7 @@ # Unconditionally prepend truffle.jar to the boot class path. # This used to be done by the VM itself but was removed to # separate the VM from Truffle. - truffle_jar = mx.distribution('truffle:TRUFFLE').path + truffle_jar = mx.distribution('truffle:TRUFFLE_API').path vmArgs = ['-Xbootclasspath/p:' + truffle_jar] + vmArgs return (vmArgs, mainClass, mainClassArgs)
--- a/mx.graal/suite.py Wed Aug 05 01:03:28 2015 +0200 +++ b/mx.graal/suite.py Thu Aug 06 18:57:34 2015 +0200 @@ -14,7 +14,7 @@ }, { "name" : "truffle", - "version" : "ffbc7f472438044ca1134d803605cbcd03679a5b", + "version" : "38e0e8fd22dc8ef4148a47f07c3eee1108e24074", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/truffle", "kind" : "hg"}, {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"}, @@ -808,7 +808,7 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ - "truffle:TRUFFLE", + "truffle:TRUFFLE_API", "com.oracle.graal.runtime", "com.oracle.graal.replacements", ], @@ -976,7 +976,7 @@ ], "distDependencies" : [ "GRAAL", - "truffle:TRUFFLE", + "truffle:TRUFFLE_API", ], },