[GR-54692] Accept malformed type descriptors coming from user files w…

…ith a warning PullRequest: graal/18077
oracle · Aug 1, 2024 · 5487e6b · 5487e6b
2 parents ba1f265 + 99434af
commit 5487e6b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...rc/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationTypeDescriptor.java b/...rc/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationTypeDescriptor.java
@@ -26,6 +26,10 @@
 
 import java.util.Collection;
 
+import org.graalvm.nativeimage.ImageInfo;
+
+import com.oracle.svm.util.LogUtils;
+
 import jdk.graal.compiler.util.json.JsonPrintable;
 import jdk.vm.ci.meta.MetaUtil;
 
@@ -68,7 +72,9 @@ enum Kind {
  Collection<String> getAllQualifiedJavaNames();
 
  static String checkQualifiedJavaName(String javaName) {
- assert javaName.indexOf('/') == -1 || javaName.indexOf('/') > javaName.lastIndexOf('.') : "Requires qualified Java name, not internal representation: %s".formatted(javaName);
+ if (ImageInfo.inImageBuildtimeCode() && !(javaName.indexOf('/') == -1 || javaName.indexOf('/') > javaName.lastIndexOf('.'))) {
+ LogUtils.warning("Type descriptor requires qualified Java name, not internal representation: %s", javaName);
+ }
  return canonicalizeTypeName(javaName);
  }
 }
diff --git a/...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java b/...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java
@@ -946,6 +946,13 @@ private void registerTypesForRecordComponent(RecordComponent recordComponent) {
  registerTypesForTypeAnnotations(recordComponent);
  }
 
+ private void registerTypesForError(Throwable t) {
+ metaAccess.lookupJavaType(t.getClass()).registerAsInstantiated("Error object on the image heap for reflective queries");
+ if (t.getCause() != null) {
+ registerTypesForError(t.getCause());
+ }
+ }
+
  private void registerTypesForAnnotations(AnnotatedElement annotatedElement) {
  if (annotatedElement != null) {
  if (!filteredAnnotations.containsKey(annotatedElement)) {
@@ -1097,10 +1104,11 @@ private void maybeRegisterRecordComponents(Class<?> clazz) {
  }
  }
 
- private static void registerLinkageError(Class<?> clazz, LinkageError error, Map<Class<?>, Throwable> errorMap) {
+ private void registerLinkageError(Class<?> clazz, LinkageError error, Map<Class<?>, Throwable> errorMap) {
  if (LinkAtBuildTimeSupport.singleton().linkAtBuildTime(clazz)) {
  throw error;
  } else {
+ registerTypesForError(error);
  errorMap.put(clazz, error);
  }
  }