[Truffle] Reintroduce version check, it is at least useful for 0.8.

* Fixes #3311.
jruby · Sep 7, 2015 · 04cf44a · 04cf44a
1 parent fe19bb5
commit 04cf44a
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
@@ -380,6 +380,7 @@ private void processArgument() {
                     } else if (extendedOption.equals("+C") || extendedOption.equals("+CIR")) {
                         config.setCompileMode(RubyInstanceConfig.CompileMode.FORCE);
                     } else if (extendedOption.equals("+T")) {
+                        checkGraalVersion();
                         Options.PARSER_WARN_GROUPED_EXPRESSIONS.force(Boolean.FALSE.toString());
                         config.setCompileMode(RubyInstanceConfig.CompileMode.TRUFFLE);
                         config.setDisableGems(true);
@@ -714,6 +715,18 @@ private void logScriptResolutionFailure(String path) {
         }
     }
 
+    public static void checkGraalVersion() {
+        final String graalVersion = System.getProperty("graal.version", "unknown");
+        final String expectedGraalVersion = "0.7";
+
+        if (graalVersion.equals("unknown")) {
+            return;
+        } else if (!graalVersion.equals(expectedGraalVersion)) {
+            throw new RuntimeException("This version of JRuby is built against Graal " + expectedGraalVersion +
+                    " but you are using it with version " + graalVersion + " - either update Graal or use with (-J)-original to disable Graal and ignore this error");
+        }
+    }
+
     private static final Set<String> KNOWN_PROPERTIES = new HashSet<>();
 
     static {