Replace reportReregistered with setNotPreserved

DSouzaM · DSouzaM · commit 822c6fcd650b · 2025-10-17T15:32:10.000-04:00
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/RuntimeConditionSet.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/RuntimeConditionSet.java
@@ -145,19 +145,13 @@ public boolean satisfied() {
         return result;
     }
 
-    public boolean preserved() {
+    public boolean isPreserved() {
         return preserved;
     }
 
-    /**
-     * Updates the "preserved" state when the value is re-registered.
-     */
     @Platforms(Platform.HOSTED_ONLY.class)
-    public void reportReregistered(boolean reregisterPreserved) {
-        // State can only ever go from "preserved" to "not preserved".
-        if (!reregisterPreserved) {
-            this.preserved = false;
-        }
+    public void setNotPreserved() {
+        this.preserved = false;
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java
@@ -247,8 +247,10 @@ public static ConditionalRuntimeValue<Object> updateConditionalValue(Conditional
             return new ConditionalRuntimeValue<>(RuntimeConditionSet.createHosted(additionalCondition, preserved), newValue);
         } else {
             existingConditionalValue.getConditions().addCondition(additionalCondition);
-            existingConditionalValue.getConditions().reportReregistered(preserved);
             existingConditionalValue.updateValue(newValue);
+            if (!preserved) {
+                existingConditionalValue.getConditions().setNotPreserved();
+            }
             return existingConditionalValue;
         }
     }
@@ -290,7 +292,9 @@ private void registerKnownClassName(AccessCondition condition, String className,
                 knownClassNames.put(className, RuntimeConditionSet.createHosted(condition, preserved));
             } else {
                 existingConditions.addCondition(condition);
-                existingConditions.reportReregistered(preserved);
+                if (!preserved) {
+                    existingConditions.setNotPreserved();
+                }
             }
         }
     }
@@ -303,7 +307,9 @@ public void registerUnsafeAllocated(AccessCondition condition, Class<?> clazz, b
                 var conditionSet = unsafeInstantiatedClasses.putIfAbsent(clazz, RuntimeConditionSet.createHosted(condition, preserved));
                 if (conditionSet != null) {
                     conditionSet.addCondition(condition);
-                    conditionSet.reportReregistered(preserved);
+                    if (!preserved) {
+                        conditionSet.setNotPreserved();
+                    }
                 }
             }
         }
@@ -453,12 +459,12 @@ public static boolean isPreserved(Class<?> jClass) {
             if (conditionSet == null) {
                 return false;
             }
-            return conditionSet.preserved();
+            return conditionSet.isPreserved();
         }
         for (var singleton : layeredSingletons()) {
             ConditionalRuntimeValue<Object> conditionalClass = singleton.knownClasses.get(jClassName);
             if (conditionalClass != null) {
-                return conditionalClass.getConditions().preserved();
+                return conditionalClass.getConditions().isPreserved();
             }
         }
         return false;
@@ -469,7 +475,7 @@ public static boolean isUnsafeAllocatedPreserved(Class<?> jClass) {
         for (var singleton : layeredSingletons()) {
             RuntimeConditionSet conditionSet = singleton.unsafeInstantiatedClasses.get(jClass);
             if (conditionSet != null) {
-                return conditionSet.preserved();
+                return conditionSet.isPreserved();
             }
         }
         return false;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleClass.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleClass.java
@@ -82,8 +82,8 @@ public void addOrUpdateField(String name, boolean updatedPreserved, Function<Str
         JNIAccessibleField existing = fields.get(name);
         if (existing == null) {
             fields.put(name, mappingFunction.apply(name));
-        } else {
-            existing.reportReregistered(updatedPreserved);
+        } else if (!updatedPreserved) {
+            existing.setNotPreserved();
         }
     }
 
@@ -95,8 +95,8 @@ public void addOrUpdateMethod(JNIAccessibleMethodDescriptor descriptor, boolean
         JNIAccessibleMethod existing = methods.get(descriptor);
         if (existing == null) {
             methods.put(descriptor, mappingFunction.apply(descriptor));
-        } else {
-            existing.reportReregistered(updatedPreserved);
+        } else if (!updatedPreserved) {
+            existing.setNotPreserved();
         }
     }
 
@@ -134,10 +134,7 @@ public boolean isPreserved() {
     }
 
     @Override
-    public void reportReregistered(boolean updatedPreserved) {
-        // State can only ever go from "preserved" to "not preserved".
-        if (!updatedPreserved) {
-            this.preserved = false;
-        }
+    public void setNotPreserved() {
+        preserved = false;
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleField.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleField.java
@@ -169,12 +169,8 @@ public boolean isPreserved() {
         return id.and(ID_PRESERVED_FLAG).notEqual(0);
     }
 
-    @Platforms(HOSTED_ONLY.class)
     @Override
-    public void reportReregistered(boolean updatedPreserved) {
-        // State can only ever go from "preserved" to "not preserved".
-        if (!updatedPreserved) {
-            flags = flags.and(ID_PRESERVED_FLAG.not());
-        }
+    public void setNotPreserved() {
+        flags = flags.and(ID_PRESERVED_FLAG.not());
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java
@@ -180,10 +180,7 @@ public boolean isPreserved() {
     }
 
     @Override
-    public void reportReregistered(boolean updatedPreserved) {
-        // State can only ever go from "preserved" to "not preserved".
-        if (!updatedPreserved) {
-            modifiers = modifiers & (~RuntimeMetadataDecoderImpl.PRESERVED_FLAG_MASK);
-        }
+    public void setNotPreserved() {
+        modifiers = modifiers & (~RuntimeMetadataDecoderImpl.PRESERVED_FLAG_MASK);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java
@@ -164,7 +164,9 @@ public JNIAccessibleClass addOrUpdateClass(Class<?> classObj, boolean updatedPre
             classesByName.put(name, instance);
             return instance;
         } else {
-            existing.reportReregistered(updatedPreserved);
+            if (!updatedPreserved) {
+                existing.setNotPreserved();
+            }
             return existing;
         }
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/PreservableJNIElement.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/PreservableJNIElement.java
@@ -39,5 +39,5 @@ public interface PreservableJNIElement {
     boolean isPreserved();
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    void reportReregistered(boolean updatedPreserved);
+    void setNotPreserved();
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java
@@ -119,8 +119,8 @@ public synchronized void addProxyClass(AccessCondition condition, boolean preser
         if (conditionalValue == null) {
             conditionalValue = new ConditionalRuntimeValue<>(RuntimeConditionSet.emptySet(preserved), createProxyClass(intfs, preserved));
             proxyCache.put(key, conditionalValue);
-        } else {
-            conditionalValue.getConditions().reportReregistered(preserved);
+        } else if (!preserved) {
+            conditionalValue.getConditions().setNotPreserved();
         }
         conditionalValue.getConditions().addCondition(condition);
     }
@@ -233,7 +233,7 @@ public Class<?> getProxyClass(ClassLoader loader, Class<?>... interfaces) {
     public boolean isProxyPreserved(Class<?>... interfaces) {
         ProxyCacheKey key = new ProxyCacheKey(interfaces);
         if (proxyCache.get(key) instanceof ConditionalRuntimeValue<Object> entry) {
-            return entry.getConditions().preserved();
+            return entry.getConditions().isPreserved();
         }
         return false;
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java
@@ -224,7 +224,9 @@ public void registerSerializationTargetClass(AccessCondition cnd, DynamicHub hub
             var previous = classes.putIfAbsent(BuildPhaseProvider.isHostedUniverseBuilt() ? hub.getTypeID() : new DynamicHubKey(hub), RuntimeConditionSet.createHosted(cnd, preserved));
             if (previous != null) {
                 previous.addCondition(cnd);
-                previous.reportReregistered(preserved);
+                if (!preserved) {
+                    previous.setNotPreserved();
+                }
             }
         }
     }
@@ -319,7 +321,7 @@ public static boolean isPreservedForSerialization(DynamicHub dynamicHub) {
         for (SerializationSupport singleton : SerializationSupport.layeredSingletons()) {
             var conditionSet = singleton.classes.get(dynamicHub.getTypeID());
             if (conditionSet != null) {
-                return conditionSet.preserved();
+                return conditionSet.isPreserved();
             }
         }
         return false;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RuntimeMetadataEncoderImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RuntimeMetadataEncoderImpl.java
@@ -967,7 +967,7 @@ private void encodeField(UnsafeArrayTypeWriter buf, FieldMetadata field) {
         modifiers |= field.heapObject != null ? IN_HEAP_FLAG_MASK : 0;
         modifiers |= field.hiding ? HIDING_FLAG_MASK : 0;
         modifiers |= field.negative ? NEGATIVE_FLAG_MASK : 0;
-        modifiers |= field.conditions.preserved() ? PRESERVED_FLAG_MASK : 0;
+        modifiers |= field.conditions.isPreserved() ? PRESERVED_FLAG_MASK : 0;
         buf.putUV(modifiers);
         encodeConditions(buf, field.conditions);
 
@@ -1003,7 +1003,7 @@ private void encodeExecutable(UnsafeArrayTypeWriter buf, ExecutableMetadata exec
         modifiers |= executable.heapObject != null ? IN_HEAP_FLAG_MASK : 0;
         modifiers |= isHiding ? HIDING_FLAG_MASK : 0;
         modifiers |= executable.negative ? NEGATIVE_FLAG_MASK : 0;
-        modifiers |= executable.conditions.preserved() ? PRESERVED_FLAG_MASK : 0;
+        modifiers |= executable.conditions.isPreserved() ? PRESERVED_FLAG_MASK : 0;
         buf.putUV(modifiers);
 
         encodeConditions(buf, executable.conditions);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java
@@ -485,8 +485,8 @@ private void registerMethod(AccessCondition cnd, boolean queriedOnly, boolean pr
                 conditionalValue = newConditionalValue;
                 registered = true;
             }
-        } else {
-            conditionalValue.getConditions().reportReregistered(preserved);
+        } else if (!preserved) {
+            conditionalValue.getConditions().setNotPreserved();
         }
         if (!queriedOnly) {
             /* queryOnly methods are conditioned by the type itself */
@@ -655,7 +655,9 @@ private void registerField(AccessCondition cnd, boolean queriedOnly, boolean pre
         boolean shouldRegisterReachabilityHandler = classFields.isEmpty();
         var cndValue = classFields.computeIfAbsent(analysisField, _ -> new ConditionalRuntimeValue<>(RuntimeConditionSet.emptySet(preserved), reflectField));
         if (exists) {
-            cndValue.getConditions().reportReregistered(preserved);
+            if (!preserved) {
+                cndValue.getConditions().setNotPreserved();
+            }
         } else {
             registerTypesForField(analysisField, reflectField, queriedOnly);
 

Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,10 @@ public static ConditionalRuntimeValue<Object> updateConditionalValue(Conditional`
`247`	`247`	`return new ConditionalRuntimeValue<>(RuntimeConditionSet.createHosted(additionalCondition, preserved), newValue);`
`248`	`248`	`} else {`
`249`	`249`	`existingConditionalValue.getConditions().addCondition(additionalCondition);`
`250`		`- existingConditionalValue.getConditions().reportReregistered(preserved);`
`251`	`250`	`existingConditionalValue.updateValue(newValue);`
	`251`	`+ if (!preserved) {`
	`252`	`+ existingConditionalValue.getConditions().setNotPreserved();`
	`253`	`+ }`
`252`	`254`	`return existingConditionalValue;`
`253`	`255`	`}`
`254`	`256`	`}`
`@@ -290,7 +292,9 @@ private void registerKnownClassName(AccessCondition condition, String className,`
`290`	`292`	`knownClassNames.put(className, RuntimeConditionSet.createHosted(condition, preserved));`
`291`	`293`	`} else {`
`292`	`294`	`existingConditions.addCondition(condition);`
`293`		`- existingConditions.reportReregistered(preserved);`
	`295`	`+ if (!preserved) {`
	`296`	`+ existingConditions.setNotPreserved();`
	`297`	`+ }`
`294`	`298`	`}`
`295`	`299`	`}`
`296`	`300`	`}`
`@@ -303,7 +307,9 @@ public void registerUnsafeAllocated(AccessCondition condition, Class<?> clazz, b`
`303`	`307`	`var conditionSet = unsafeInstantiatedClasses.putIfAbsent(clazz, RuntimeConditionSet.createHosted(condition, preserved));`
`304`	`308`	`if (conditionSet != null) {`
`305`	`309`	`conditionSet.addCondition(condition);`
`306`		`- conditionSet.reportReregistered(preserved);`
	`310`	`+ if (!preserved) {`
	`311`	`+ conditionSet.setNotPreserved();`
	`312`	`+ }`
`307`	`313`	`}`
`308`	`314`	`}`
`309`	`315`	`}`
`@@ -453,12 +459,12 @@ public static boolean isPreserved(Class<?> jClass) {`
`453`	`459`	`if (conditionSet == null) {`
`454`	`460`	`return false;`
`455`	`461`	`}`
`456`		`- return conditionSet.preserved();`
	`462`	`+ return conditionSet.isPreserved();`
`457`	`463`	`}`
`458`	`464`	`for (var singleton : layeredSingletons()) {`
`459`	`465`	`ConditionalRuntimeValue<Object> conditionalClass = singleton.knownClasses.get(jClassName);`
`460`	`466`	`if (conditionalClass != null) {`
`461`		`- return conditionalClass.getConditions().preserved();`
	`467`	`+ return conditionalClass.getConditions().isPreserved();`
`462`	`468`	`}`
`463`	`469`	`}`
`464`	`470`	`return false;`
`@@ -469,7 +475,7 @@ public static boolean isUnsafeAllocatedPreserved(Class<?> jClass) {`
`469`	`475`	`for (var singleton : layeredSingletons()) {`
`470`	`476`	`RuntimeConditionSet conditionSet = singleton.unsafeInstantiatedClasses.get(jClass);`
`471`	`477`	`if (conditionSet != null) {`
`472`		`- return conditionSet.preserved();`
	`478`	`+ return conditionSet.isPreserved();`
`473`	`479`	`}`
`474`	`480`	`}`
`475`	`481`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ public void addOrUpdateField(String name, boolean updatedPreserved, Function<Str`
`82`	`82`	`JNIAccessibleField existing = fields.get(name);`
`83`	`83`	`if (existing == null) {`
`84`	`84`	`fields.put(name, mappingFunction.apply(name));`
`85`		`- } else {`
`86`		`- existing.reportReregistered(updatedPreserved);`
	`85`	`+ } else if (!updatedPreserved) {`
	`86`	`+ existing.setNotPreserved();`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -95,8 +95,8 @@ public void addOrUpdateMethod(JNIAccessibleMethodDescriptor descriptor, boolean`
`95`	`95`	`JNIAccessibleMethod existing = methods.get(descriptor);`
`96`	`96`	`if (existing == null) {`
`97`	`97`	`methods.put(descriptor, mappingFunction.apply(descriptor));`
`98`		`- } else {`
`99`		`- existing.reportReregistered(updatedPreserved);`
	`98`	`+ } else if (!updatedPreserved) {`
	`99`	`+ existing.setNotPreserved();`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`@@ -134,10 +134,7 @@ public boolean isPreserved() {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`@Override`
`137`		`- public void reportReregistered(boolean updatedPreserved) {`
`138`		`- // State can only ever go from "preserved" to "not preserved".`
`139`		`- if (!updatedPreserved) {`
`140`		`- this.preserved = false;`
`141`		`- }`
	`137`	`+ public void setNotPreserved() {`
	`138`	`+ preserved = false;`
`142`	`139`	`}`
`143`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,12 +169,8 @@ public boolean isPreserved() {`
`169`	`169`	`return id.and(ID_PRESERVED_FLAG).notEqual(0);`
`170`	`170`	`}`
`171`	`171`
`172`		`- @Platforms(HOSTED_ONLY.class)`
`173`	`172`	`@Override`
`174`		`- public void reportReregistered(boolean updatedPreserved) {`
`175`		`- // State can only ever go from "preserved" to "not preserved".`
`176`		`- if (!updatedPreserved) {`
`177`		`- flags = flags.and(ID_PRESERVED_FLAG.not());`
`178`		`- }`
	`173`	`+ public void setNotPreserved() {`
	`174`	`+ flags = flags.and(ID_PRESERVED_FLAG.not());`
`179`	`175`	`}`
`180`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,10 +180,7 @@ public boolean isPreserved() {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`@Override`
`183`		`- public void reportReregistered(boolean updatedPreserved) {`
`184`		`- // State can only ever go from "preserved" to "not preserved".`
`185`		`- if (!updatedPreserved) {`
`186`		`- modifiers = modifiers & (~RuntimeMetadataDecoderImpl.PRESERVED_FLAG_MASK);`
`187`		`- }`
	`183`	`+ public void setNotPreserved() {`
	`184`	`+ modifiers = modifiers & (~RuntimeMetadataDecoderImpl.PRESERVED_FLAG_MASK);`
`188`	`185`	`}`
`189`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,9 @@ public JNIAccessibleClass addOrUpdateClass(Class<?> classObj, boolean updatedPre`
`164`	`164`	`classesByName.put(name, instance);`
`165`	`165`	`return instance;`
`166`	`166`	`} else {`
`167`		`- existing.reportReregistered(updatedPreserved);`
	`167`	`+ if (!updatedPreserved) {`
	`168`	`+ existing.setNotPreserved();`
	`169`	`+ }`
`168`	`170`	`return existing;`
`169`	`171`	`}`
`170`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ public interface PreservableJNIElement {`
`39`	`39`	`boolean isPreserved();`
`40`	`40`
`41`	`41`	`@Platforms(Platform.HOSTED_ONLY.class)`
`42`		`- void reportReregistered(boolean updatedPreserved);`
	`42`	`+ void setNotPreserved();`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ public synchronized void addProxyClass(AccessCondition condition, boolean preser`
`119`	`119`	`if (conditionalValue == null) {`
`120`	`120`	`conditionalValue = new ConditionalRuntimeValue<>(RuntimeConditionSet.emptySet(preserved), createProxyClass(intfs, preserved));`
`121`	`121`	`proxyCache.put(key, conditionalValue);`
`122`		`- } else {`
`123`		`- conditionalValue.getConditions().reportReregistered(preserved);`
	`122`	`+ } else if (!preserved) {`
	`123`	`+ conditionalValue.getConditions().setNotPreserved();`
`124`	`124`	`}`
`125`	`125`	`conditionalValue.getConditions().addCondition(condition);`
`126`	`126`	`}`
`@@ -233,7 +233,7 @@ public Class<?> getProxyClass(ClassLoader loader, Class<?>... interfaces) {`
`233`	`233`	`public boolean isProxyPreserved(Class<?>... interfaces) {`
`234`	`234`	`ProxyCacheKey key = new ProxyCacheKey(interfaces);`
`235`	`235`	`if (proxyCache.get(key) instanceof ConditionalRuntimeValue<Object> entry) {`
`236`		`- return entry.getConditions().preserved();`
	`236`	`+ return entry.getConditions().isPreserved();`
`237`	`237`	`}`
`238`	`238`	`return false;`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,9 @@ public void registerSerializationTargetClass(AccessCondition cnd, DynamicHub hub`
`224`	`224`	`var previous = classes.putIfAbsent(BuildPhaseProvider.isHostedUniverseBuilt() ? hub.getTypeID() : new DynamicHubKey(hub), RuntimeConditionSet.createHosted(cnd, preserved));`
`225`	`225`	`if (previous != null) {`
`226`	`226`	`previous.addCondition(cnd);`
`227`		`- previous.reportReregistered(preserved);`
	`227`	`+ if (!preserved) {`
	`228`	`+ previous.setNotPreserved();`
	`229`	`+ }`
`228`	`230`	`}`
`229`	`231`	`}`
`230`	`232`	`}`
`@@ -319,7 +321,7 @@ public static boolean isPreservedForSerialization(DynamicHub dynamicHub) {`
`319`	`321`	`for (SerializationSupport singleton : SerializationSupport.layeredSingletons()) {`
`320`	`322`	`var conditionSet = singleton.classes.get(dynamicHub.getTypeID());`
`321`	`323`	`if (conditionSet != null) {`
`322`		`- return conditionSet.preserved();`
	`324`	`+ return conditionSet.isPreserved();`
`323`	`325`	`}`
`324`	`326`	`}`
`325`	`327`	`return false;`