Skip to content

Commit 3cda6f3

Browse files
committed
[GR-25899] [GR-25927] Less strict VM config value checking for non-JVMCI JDKs.
PullRequest: graal/7063
2 parents beb4a37 + 72bc397 commit 3cda6f3

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

compiler/ci_common/gate.hocon

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,6 @@ dailyJDK15Debug: ${oraclejdk15Debug} {
197197
198198
]
199199
timelimit: "2:00:00"
200-
packages: {
201-
# SVM object files with debuginfo are apparently more likely to be subject
202-
# to linker incompatibilities so we need to use the same linker use for building JDK 15
203-
binutils: "==2.34"
204-
}
205200
}
206201

207202
gateLinuxAMD64AVX3 : ${gateLinuxAMD64} {

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,19 +231,23 @@ protected void reportErrors() {
231231
}
232232

233233
static void reportError(String rawErrorMessage) {
234-
String value = getProperty("JVMCI_CONFIG_CHECK");
234+
String value = System.getenv("JVMCI_CONFIG_CHECK");
235235
Formatter errorMessage = new Formatter().format(rawErrorMessage);
236236
String javaHome = getProperty("java.home");
237237
String vmName = getProperty("java.vm.name");
238-
errorMessage.format("%nSet the JVMCI_CONFIG_CHECK system property to \"ignore\" to suppress ");
238+
errorMessage.format("%nSet the JVMCI_CONFIG_CHECK environment variable to \"ignore\" to suppress ");
239239
errorMessage.format("this error or to \"warn\" to emit a warning and continue execution.%n");
240240
errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
241241
errorMessage.format("Currently used VM configuration is: %s%n", vmName);
242242
if ("ignore".equals(value)) {
243243
return;
244244
} else if ("warn".equals(value) || JDK_PRERELEASE) {
245245
System.err.println(errorMessage.toString());
246-
} else {
246+
} else if (!JVMCI && Assertions.assertionsEnabled()) {
247+
// We cannot control when VM config updates are made in non JVMCI JDKs so
248+
// only issue a warning and only when assertions are enabled.
249+
System.err.println(errorMessage.toString());
250+
} else if (JVMCI) {
247251
throw new JVMCIError(errorMessage.toString());
248252
}
249253
}

vm/ci_common/common.hocon

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,14 @@ libgraal_truffle: ${svm-common-linux-amd64} ${custom_vm_linux} ${vm_linux} {
278278
targets: [gate]
279279
}
280280

281+
binutils2_34: {
282+
packages: {
283+
# On Linux AMD64, SVM object files with debuginfo are apparently more likely to be subject
284+
# to linker incompatibilities so we need to use the same linker used for building JDK 15
285+
binutils: "==2.34"
286+
}
287+
}
288+
281289
builds += [
282290
#
283291
# Gates
@@ -291,12 +299,12 @@ builds += [
291299
${libgraal_compiler} ${vm_java_8} { name: gate-vm-libgraal-compiler-8-linux-amd64 }
292300
${libgraal_compiler} ${vm_java_11} { name: gate-vm-libgraal-compiler-11-linux-amd64 }
293301
${libgraal_compiler} ${vm_java_15} { name: gate-vm-libgraal-compiler-15-linux-amd64 }
294-
${libgraal_compiler} ${vm_java_15Debug} { name: daily-vm-libgraal-compiler-15-linux-amd64 } ${dailyJDK15Debug}
302+
${libgraal_compiler} ${vm_java_15Debug} { name: daily-vm-libgraal-compiler-15-linux-amd64 } ${dailyJDK15Debug} ${binutils2_34}
295303

296304
${libgraal_truffle} ${vm_java_8} { name: gate-vm-libgraal-truffle-8-linux-amd64 }
297305
${libgraal_truffle} ${vm_java_11} { name: gate-vm-libgraal-truffle-11-linux-amd64 }
298306
${libgraal_truffle} ${vm_java_15} { name: gate-vm-libgraal-truffle-15-linux-amd64 }
299-
${libgraal_truffle} ${vm_java_15Debug} { name: daily-vm-libgraal-truffle-15-linux-amd64 } ${dailyJDK15Debug}
307+
${libgraal_truffle} ${vm_java_15Debug} { name: daily-vm-libgraal-truffle-15-linux-amd64 } ${dailyJDK15Debug} ${binutils2_34}
300308

301309
${vm_java_8} ${svm-common-linux-amd64} ${sulong_linux} ${custom_vm_linux} ${gate_vm_linux} {
302310
run: [

0 commit comments

Comments
 (0)