Skip to content
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

Jump to bottom

Make GeneratorStrategy.generate unreachable on native #29521

Closed
wants to merge 1 commit into from
Closed

Make GeneratorStrategy.generate unreachable on native #29521

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ng-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@ class PreComputeFieldFeature implements Feature {

private static Pattern[] patterns = {
Pattern.compile(Pattern.quote("org.springframework.core.NativeDetector#imageCode")),
Pattern.compile(Pattern.quote("org.springframework.cglib.core.AbstractClassGenerator#imageCode")),
Pattern.compile(Pattern.quote("org.springframework.") + ".*#.*Present"),
Pattern.compile(Pattern.quote("org.springframework.") + ".*#.*PRESENT"),
Pattern.compile(Pattern.quote("reactor.") + ".*#.*Available")
Expand Down
9 changes: 9 additions & 0 deletions spring-core/src/main/java/org/springframework/cglib/core/AbstractClassGenerator.java
View file
Open in desktop
Expand Up @@ -43,6 +43,9 @@ abstract public class AbstractClassGenerator<T> implements ClassGenerator {
private static final boolean DEFAULT_USE_CACHE =
Boolean.parseBoolean(System.getProperty("cglib.useCache", "true"));

// See https://github.com/oracle/graal/blob/master/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java
private static final boolean imageCode = (System.getProperty("org.graalvm.nativeimage.imagecode") != null);


private GeneratorStrategy strategy = DefaultGeneratorStrategy.INSTANCE;

Expand Down Expand Up @@ -359,6 +362,12 @@ protected Class generate(ClassLoaderData data) {
// ignore
}
}
// SPRING PATCH BEGIN
if (imageCode) {
throw new UnsupportedOperationException("CGLIB runtime enhancement not supported on native image. " +
"Make sure to include a pre-generated class on the classpath instead: " + getClassName());
}
// SPRING PATCH END
byte[] b = strategy.generate(this);
String className = ClassNameReader.getClassName(new ClassReader(b));
ProtectionDomain protectionDomain = getProtectionDomain();
Expand Down