From baa8cfc3bb11cbbd087100e406c2de02eefa593a Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 9 Mar 2021 13:26:51 -0800
Subject: [PATCH] Improve error message.

---
 .../svm/core/jdk/SecuritySubstitutions.java      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
index 7bae12a18a32..dded27b04bf5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
@@ -512,6 +512,12 @@ final class Target_sun_security_provider_PolicyFile {
 @SuppressWarnings({"unused", "static-method"})
 final class Target_sun_security_jca_ProviderConfig {
 
+    @Alias @TargetElement(onlyWith = JDK11OrLater.class) //
+    private String provName;
+
+    @Alias @TargetElement(onlyWith = JDK8OrEarlier.class) //
+    private String className;
+
     /**
      * All security providers used in a native-image must be registered during image build time. At
      * runtime, we shouldn't have a call to doLoadProvider. However, this method is still reachable
@@ -523,10 +529,16 @@ final class Target_sun_security_jca_ProviderConfig {
      * {@link org.jcp.xml.dsig.internal.dom.XMLDSigRI}.
      */
     @Substitute
-    private Provider doLoadProvider() {
-        throw VMError.unsupportedFeature("Cannot load new security provider at runtime.");
+    @TargetElement(name = "doLoadProvider", onlyWith = JDK11OrLater.class)
+    private Provider doLoadProviderJDK11OrLater() {
+        throw VMError.unsupportedFeature("Cannot load new security provider at runtime: " + provName + ".");
     }
 
+    @Substitute
+    @TargetElement(name = "doLoadProvider", onlyWith = JDK8OrEarlier.class)
+    private Provider doLoadProviderJDK8OrEarlier() {
+        throw VMError.unsupportedFeature("Cannot load new security provider at runtime: " + className + ".");
+    }
 }
 
 @SuppressWarnings("unused")