More JDK version checks in CI job definitions

oracle · Jan 19, 2022 · 741449a · 741449a
1 parent 4c4d01d
commit 741449a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bench-common.libsonnet b/bench-common.libsonnet
@@ -23,8 +23,9 @@
     min_jdk_version:: null,
     max_jdk_version:: null,
     is_jdk_supported(jdk_version)::
-      if self.min_jdk_version != null && jdk_version < self.min_jdk_version then false
-      else if self.max_jdk_version != null && jdk_version > self.max_jdk_version then false
+      if jdk_version == null then error "jdk_version cannot be null!" else
+      if std.objectHasAll(self, "min_jdk_version") && self.min_jdk_version != null && jdk_version < self.min_jdk_version then false
+      else if std.objectHasAll(self, "max_jdk_version") &&  self.max_jdk_version != null && jdk_version > self.max_jdk_version then false
       else true
   },
 

diff --git a/compiler/ci_common/compiler-common.libsonnet b/compiler/ci_common/compiler-common.libsonnet
@@ -30,7 +30,8 @@
     benchmark_cmd:: bench_common.hwlocIfNuma(self.should_use_hwloc, self.plain_benchmark_cmd, node=self.default_numa_node),
     min_heap_size:: if std.objectHasAll(self.environment, 'XMS') then ["-Xms${XMS}"] else [],
     max_heap_size:: if std.objectHasAll(self.environment, 'XMX') then ["-Xmx${XMX}"] else [],
-    extra_vm_args:: ["--profiler=${MX_PROFILER}", "--jvm=${JVM}", "--jvm-config=${JVM_CONFIG}", "-XX:+PrintConcurrentLocks", "-Dgraal.CompilationFailureAction=Diagnose", "-Dgraal.WarnMissingIntrinsic=true"] + self.min_heap_size + self.max_heap_size,
+    _WarnMissingIntrinsic:: true, # won't be needed after GR-34642
+    extra_vm_args:: ["--profiler=${MX_PROFILER}", "--jvm=${JVM}", "--jvm-config=${JVM_CONFIG}", "-XX:+PrintConcurrentLocks", "-Dgraal.CompilationFailureAction=Diagnose"] + (if self._WarnMissingIntrinsic then ["-Dgraal.WarnMissingIntrinsic=true"] else []) + self.min_heap_size + self.max_heap_size,
     should_mx_build:: true,
     setup+: [
       ["cd", "./" + config.compiler.compiler_suite],