Ensure uniqueness of short names for constructors

oldcwj · Oct 6, 2022 · 3d15b72 · 3d15b72
1 parent bd9803f
commit 3d15b72
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageBFDNameProvider.java b/...src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageBFDNameProvider.java
@@ -365,13 +365,14 @@ public String mangle(String loaderName, ResolvedJavaType declaringClass, String
             String selector = memberName;
             if (isConstructor) {
                 assert methodSignature != null;
-                assert selector.equals("<init>");
-                int index = fqn.lastIndexOf('.');
+                // replace <init> with the class name n.b. it may include a disambiguating suffix
+                assert selector.startsWith("<init>");
+                String replacement = fqn;
+                int index = replacement.lastIndexOf('.');
                 if (index >= 0) {
-                    selector = fqn.substring(index);
-                } else {
-                    selector = fqn;
+                    replacement = fqn.substring(index + 1);
                 }
+                selector = selector.replace("<init>", replacement);
             }
             mangleClassAndMemberName(loaderName, fqn, selector);
             if (methodSignature != null) {

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java
@@ -108,7 +108,9 @@ public static HostedMethod create(HostedUniverse universe, AnalysisMethod wrappe
         int collisionCount = universe.uniqueHostedMethodNames.merge(uniqueShortName, 0, (oldValue, value) -> oldValue + 1);
         if (collisionCount > 0) {
             name = name + METHOD_NAME_COLLISION_SUFFIX + collisionCount;
-            uniqueShortName = SubstrateUtil.uniqueShortName(holder.getJavaClass().getClassLoader(), holder, name, signature, wrapped.isConstructor());
+            String fixedUniqueShortName = SubstrateUtil.uniqueShortName(holder.getJavaClass().getClassLoader(), holder, name, signature, wrapped.isConstructor());
+            VMError.guarantee(!fixedUniqueShortName.equals(uniqueShortName), "failed to generate uniqueShortName for HostedMethod created for " + wrapped);
+            uniqueShortName = fixedUniqueShortName;
         }
         return new HostedMethod(wrapped, holder, signature, constantPool, handlers, deoptOrigin, name, uniqueShortName, localVariableTable);
     }