[GR-50262] Fixed review comments.

alaric27 · Nov 28, 2023 · a1afbc9 · a1afbc9
1 parent 548c835
commit a1afbc9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -525,13 +525,13 @@
       },
       "subDir" : "src",
       "dependencies" : [
-        "jdk.graal.compiler"
+        "jdk.graal.compiler",
+        "GRAAL_VERSION",
       ],
       "distDependencies" : [
         "sdk:COLLECTIONS",
         "sdk:WORD",
         "truffle:TRUFFLE_COMPILER",
-        "GRAAL_VERSION",
       ],
       "allowsJavadocWarnings": True,
       "description":  "The GraalVM compiler and the Graal-truffle optimizer.",

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -3550,8 +3550,14 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
     :type register_project: (mx.Project) -> None
     :type register_distribution: (mx.Distribution) -> None
     """
+    def _release_version():
+        version = _suite.release_version()
+        if version.endswith('-dev'):
+            version = version[:-len('-dev')]
+        return version
+
     string_substitutions = mx_subst.SubstitutionEngine(mx_subst.SubstitutionEngine(mx_subst.path_substitutions))
-    string_substitutions.register_no_arg('version', lambda: _suite.suiteDict['version'])
+    string_substitutions.register_no_arg('version', _release_version)
     attrs = {
         'description': 'SDK version file.',
         'maven': False,

diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -691,11 +691,11 @@ class UniversalDetector {
       "dependencies" : [
         "org.graalvm.polyglot",
         "org.graalvm.home",
+        "POLYGLOT_VERSION",
       ],
       "distDependencies" : [
         "COLLECTIONS",
         "NATIVEIMAGE",
-        "POLYGLOT_VERSION",
       ],
       "javadocType": "api",
       "moduleInfo" : {

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
@@ -982,7 +982,7 @@ def benchmark(args):
 
 def mx_post_parse_cmd_line(opts):
     for dist in suite.dists:
-        if not (dist.isTARDistribution() or dist.isLayoutDirDistribution()):
+        if dist.isJARDistribution():
             dist.set_archiveparticipant(GraalArchiveParticipant(dist, isTest=dist.name.endswith('_TEST')))
 
 def native_image_context_run(func, func_args=None, config=None, build_if_missing=False):

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1639,13 +1639,13 @@
                 "com.oracle.svm.truffle.nfi",
                 "com.oracle.svm.truffle.nfi.posix",
                 "com.oracle.svm.truffle.nfi.windows",
+                "TRUFFLE_RUNTIME_SVM_VERSION",
             ],
             "distDependencies": [
                 "SVM",
                 "OBJECTFILE",
                 "POINTSTO",
                 "truffle:TRUFFLE_RUNTIME",
-                "TRUFFLE_RUNTIME_SVM_VERSION",
             ],
             "moduleInfo" : {
                 "name" : "org.graalvm.truffle.runtime.svm",

diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
@@ -305,7 +305,7 @@ public void afterRegistration(AfterRegistrationAccess a) {
             Version truffleVersion = getTruffleVersion(a);
             Version featureVersion = getSVMFeatureVersion();
             if (featureVersion.compareTo(NEXT_POLYGLOT_VERSION_UPDATE) >= 0) {
-                throw new AssertionError("MAX_JDK_VERSION must be updated!");
+                throw new AssertionError("MAX_JDK_VERSION must be updated, please contact the Truffle team!");
             }
             if (featureVersion.compareTo(truffleVersion) > 0) {
                 // no forward compatibility

diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
@@ -15,6 +15,7 @@ This changelog summarizes major changes between Truffle versions relevant to lan
 * GR-41302 Added the `--engine.AssertProbes` option, which asserts that enter and return are always called in pairs on ProbeNode, verifies correct behavior of wrapper nodes. Java asserts need to be turned on for this option to have an effect.
 * GR-48816 Added new interpreted performance warning to Truffle DSL.
 * GR-44706 Relaxed `InteropLibrary` invariant assertions for side-effecting members (i.e. `hasMemberReadSideEffects` or `hasMemberWriteSideEffects`) for `readMember`, `invokeMember`, `writeMember`, and `removeMember`, allowing them to succeed even if `isMemberReadable`, `isMemberInvocable`, `isMemberWritable`, and `isMemberRemovable`, respectively, returned `false` for that member. This avoids spurious assertion failures for accessor and proxy members.
+* [GR-50262] Added the system property `-Dtruffle.UseFallbackRuntime=true`. This property is preferred over the usage of `-Dtruffle.TruffleRuntime=com.oracle.truffle.api.impl.DefaultTruffleRuntime`.
 
 ## Version 23.1.0
 

diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -1520,10 +1520,10 @@
         "com.oracle.truffle.polyglot",
         "com.oracle.truffle.host",
         "com.oracle.truffle.api.staticobject",
+        "TRUFFLE_API_VERSION",
       ],
       "distDependencies" : [
         "sdk:POLYGLOT",
-        "TRUFFLE_API_VERSION",
       ],
       "description" : "Truffle is a multi-language framework for executing dynamic languages\nthat achieves high performance when combined with Graal.",
       "javadocType": "api",