Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2025
+1 −4
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions substratevm/mx.substratevm/mx_substratevm_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand Down
2 changes: 1 addition & 1 deletion substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading