[GR-67326] Allow types starting with $Proxy without being proxy classes

PullRequest: graal/21414

Author: Zeavee

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -854,9 +854,6 @@ def build_assertions(self, benchmark: str, is_gate: bool) -> List[str]:
         # We cannot enable assertions along with emitting a build report for layered images, due to GR-65751
         if self.stages_info.current_stage.is_layered():
             return []
-        # We cannot enable assertions for Micronaut Pegasus Function due to an AssertionError (see GR-67326)
-        if self._get_benchmark_config(benchmark)["app"] == "micronaut-pegasus-function":
-            return []
         return super().build_assertions(benchmark, is_gate)
 
     def rules(self, output, benchmarks, bmSuiteArgs) -> List[Rule]:

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java

@@ -601,7 +601,7 @@ private static final class TypeComparator implements Comparator<HostedType> {
         private static Optional<HostedType[]> proxyType(HostedType type) {
             HostedType baseType = type.getBaseType();
             boolean isProxy = Proxy.isProxyClass(baseType.getJavaClass());
-            assert isProxy == (baseType.toJavaName(false).startsWith("$Proxy") && !(type.getWrapped().getWrapped() instanceof BaseLayerType));
+            assert !isProxy || (baseType.toJavaName(false).startsWith("$Proxy") && !(type.getWrapped().getWrapped() instanceof BaseLayerType));
             if (isProxy) {
                 return Optional.of(baseType.getInterfaces());
             } else {