8255068: [JVMCI] errors during compiler creation can be hidden
Reviewed-by: kvn
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index ed7df16..6915035 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -46,6 +46,7 @@
import java.util.function.Predicate;
import jdk.vm.ci.code.Architecture;
+import jdk.vm.ci.code.CompilationRequest;
import jdk.vm.ci.code.CompilationRequestResult;
import jdk.vm.ci.code.CompiledCode;
import jdk.vm.ci.code.InstalledCode;
@@ -698,6 +699,19 @@
return null;
}
+ static class ErrorCreatingCompiler implements JVMCICompiler {
+ private final RuntimeException t;
+
+ ErrorCreatingCompiler(RuntimeException t) {
+ this.t = t;
+ }
+
+ @Override
+ public CompilationRequestResult compileMethod(CompilationRequest request) {
+ throw t;
+ }
+ }
+
@Override
public JVMCICompiler getCompiler() {
if (compiler == null) {
@@ -705,11 +719,19 @@
if (compiler == null) {
assert !creatingCompiler : "recursive compiler creation";
creatingCompiler = true;
- compiler = compilerFactory.createCompiler(this);
- creatingCompiler = false;
+ try {
+ compiler = compilerFactory.createCompiler(this);
+ } catch (RuntimeException t) {
+ compiler = new ErrorCreatingCompiler(t);
+ } finally {
+ creatingCompiler = false;
+ }
}
}
}
+ if (compiler instanceof ErrorCreatingCompiler) {
+ throw ((ErrorCreatingCompiler) compiler).t;
+ }
return compiler;
}
