Don't ignore NoClassDefFoundError's when linking at build time

Closes: oracle#6253
zakkak · Apr 26, 2023 · 580fb3b · 580fb3b
1 parent 1300858
commit 580fb3b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java b/...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java
@@ -234,11 +234,13 @@ protected void maybeEagerlyResolve(int cpi, int bytecode) {
             try {
                 super.maybeEagerlyResolve(cpi, bytecode);
             } catch (UnresolvedElementException e) {
-                if (e.getCause() instanceof LinkageError || e.getCause() instanceof IllegalAccessError) {
+                Throwable cause = e.getCause();
+                if (cause instanceof LinkageError && !(linkAtBuildTime && cause instanceof NoClassDefFoundError)) {
                     /*
-                     * Ignore LinkageError if thrown from eager resolution attempt. This is usually
-                     * followed by a call to ConstantPool.lookupType() which should return an
-                     * UnresolvedJavaType which we know how to deal with.
+                     * Ignore LinkageError if thrown from eager resolution attempt, unless linking
+                     * at build time is enabled and the cause is a NoClassDefFoundError. This is
+                     * usually followed by a call to ConstantPool.lookupType() which should return
+                     * an UnresolvedJavaType which we know how to deal with.
                      */
                 } else {
                     throw e;