Skip to content

[Web Image] Fix unhandled UNSTRUCTURED_LOCKING and an order-dependent single-abstract-method failure #14195

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

Open
amritk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Web Image] Fix unhandled UNSTRUCTURED_LOCKING and an order-dependent single-abstract-method failure #14195

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
1 change: 1 addition & 0 deletions ...ebimage/src/com/oracle/svm/hosted/webimage/codegen/WebImageImplicitExceptionsFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public static String getSupportMethodName(BytecodeExceptionNode.BytecodeExceptio
case ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY -> "createNewArgumentIsNotArrayException";
case ASSERTION_ERROR_OBJECT -> "createNewAssertionErrorObject";
case ASSERTION_ERROR_NULLARY -> "createNewAssertionErrorNullary";
case UNSTRUCTURED_LOCKING -> "createNewIllegalMonitorStateException";

default -> throw GraalError.shouldNotReachHereUnexpectedValue(exceptionKind);
};
Expand Down
16 changes: 12 additions & 4 deletions ...c/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/util/ReflectUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

package com.oracle.svm.hosted.webimage.util;

import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Optional;
Expand Down Expand Up @@ -57,11 +58,18 @@ public class ReflectUtil {
private static synchronized UnmodifiableEconomicSet<String> getObjectMethodDescriptors(MetaAccessProvider metaAccess) {
if (objectMethodDescriptors == null) {
EconomicSet<String> descriptors = EconomicSet.create();
for (ResolvedJavaMethod declaredMethod : metaAccess.lookupJavaType(Object.class).getDeclaredMethods(false)) {
if (declaredMethod.isPublic()) {
descriptors.add(fullDescriptor(declaredMethod));
}
/*
* Reflection on the host java.lang.Object rather than
* ResolvedJavaType.getDeclaredMethods, because that returns an empty array for a type
* that is not linked yet and is never allowed to force linking. This set is computed
* once and cached for the rest of the build, so picking up an empty result would
* silently disable the java.lang.Object filter below for every later query, and which
* query lands here first depends on the order the parallel analysis happens to run in.
*/
for (Method declaredMethod : Object.class.getMethods()) {
descriptors.add(fullDescriptor(metaAccess.lookupJavaMethod(declaredMethod)));
}
GraalError.guarantee(!descriptors.isEmpty(), "Found no public methods on java.lang.Object");
objectMethodDescriptors = descriptors;
}

Expand Down
5 changes: 5 additions & 0 deletions ...racle.svm.webimage/src/com/oracle/svm/webimage/functionintrinsics/ImplicitExceptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ public static IllegalArgumentException createNewArgumentIsNotArrayException() {
return new IllegalArgumentException("Argument is not an array");
}

@NeverInline("outlining for smaller code size")
public static IllegalMonitorStateException createNewIllegalMonitorStateException() {
return new IllegalMonitorStateException("Unstructured locking encountered. Native Image enforces structured locking (JVMS 2.11.10)");
}

@NeverInline("outlining for smaller code size")
public static ArithmeticException createNewArithmeticException() {
return new ArithmeticException();
Expand Down