Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make ConstantFieldSubstitutionProcessor thread-safe

Browse Source 
See gh-29250
This commit is contained in:
Sébastien Deleuze
2022-10-04 15:23:09 +02:00
parent ddc7aef51b
commit 5c447bb7a4
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantFieldSubstitutionProcessor.java
View File

@@ -17,8 +17,9 @@
package org.springframework.aot.graalvm;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.regex.Pattern;
import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
@@ -51,43 +52,34 @@ class ConstantFieldSubstitutionProcessor extends SubstitutionProcessor {
private final ThrowawayClassLoader throwawayClassLoader;
private Map<String, ConstantReadableJavaField> cache = new HashMap<>();
private ConcurrentMap<String, ResolvedJavaField> cache = new ConcurrentHashMap<>();
private Set<String> ignoredFields = ConcurrentHashMap.newKeySet();
ConstantFieldSubstitutionProcessor(DebugContext debug, ClassLoader applicationClassLoader) {
this.throwawayClassLoader = new ThrowawayClassLoader(applicationClassLoader);
}
@Override
public ResolvedJavaField lookup(ResolvedJavaField field) {
ResolvedJavaType declaringClass = field.getDeclaringClass();
if (field.getType().getJavaKind() == JavaKind.Boolean && field.isStatic()) {
String fieldIdentifier = declaringClass.toJavaName() + "#" + field.getName();
for (Pattern pattern : patterns) {
if (pattern.matcher(fieldIdentifier).matches()) {
if (pattern.matcher(fieldIdentifier).matches() && !this.ignoredFields.contains(fieldIdentifier)) {
try {
if (this.cache.containsKey(fieldIdentifier)) {
ConstantReadableJavaField readableJavaField = this.cache.get(fieldIdentifier);
if (readableJavaField != null) {
return readableJavaField;
}
else {
return super.lookup(field);
}
}
JavaConstant constant = lookupConstant(declaringClass.toJavaName(), field.getName());
if (constant != null) {
return this.cache.computeIfAbsent(fieldIdentifier, key -> {
JavaConstant constant = lookupConstant(declaringClass.toJavaName(), field.getName());
// TODO Use proper logging only when --verbose is specified when https://github.com/oracle/graal/issues/4669 will be fixed
ConstantReadableJavaField readableJavaField = new ConstantReadableJavaField(field, constant);
this.cache.put(fieldIdentifier, readableJavaField);
System.out.println("Field " + fieldIdentifier + " set to " + constant.toValueString() + " at build time");
return readableJavaField;
}
});
}
catch (Throwable ex) {
this.ignoredFields.add(fieldIdentifier);
System.out.println("Processing of field " + fieldIdentifier + " skipped due the following error : " + ex.getMessage());
this.cache.put(fieldIdentifier, null);
}
}
}