[GR-69858] Publish reflection metadata atomically

Author: vjovanov

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java

@@ -327,7 +327,7 @@ private void registerClass(AccessCondition condition, ConfigurationMemberAccessi
             types.compute(analysisType, (_, td) -> {
                 TypeData typeData = td == null ? new TypeData() : td;
 
-                ConfigurationMemberAccessibility previous = typeData.registerAs(accessibility);
+                ConfigurationMemberAccessibility previous = typeData.register(accessibility, cnd, preserved);
                 if (previous == null) {
                     registerTypesForHeapType(analysisType);
                     typeData.registerLinkageError(linkType(analysisType));
@@ -340,7 +340,6 @@ private void registerClass(AccessCondition condition, ConfigurationMemberAccessi
                     if (previous == null || !previous.includes(QUERIED)) {
                         registerTypeForRuntimeAccess(analysisType);
                     }
-                    typeData.updateDynamicAccessMetadata(cnd, preserved, accessibility);
                 }
                 if (accessibility == ACCESSED) {
                     if (previous == null || !previous.includes(ACCESSED) || !preserved && typeData.dynamicAccess.isPreserved()) {
@@ -592,7 +591,7 @@ private void registerMethod(AccessCondition condition, ConfigurationMemberAccess
             methods.compute(analysisMethod, (aMethod, md) -> {
                 ElementData data = md != null ? md : new ElementData();
 
-                ConfigurationMemberAccessibility previous = data.registerAs(accessibility);
+                ConfigurationMemberAccessibility previous = data.register(accessibility, cnd, preserved);
                 if (previous == null) {
                     registerTypesForMethod(aMethod);
                 }
@@ -607,9 +606,6 @@ private void registerMethod(AccessCondition condition, ConfigurationMemberAccess
                         checkHidingMethods(aMethod);
                     }
                 }
-                if (accessibility.includes(QUERIED)) {
-                    data.updateDynamicAccessMetadata(cnd, preserved, accessibility);
-                }
                 if (accessibility.includes(ACCESSED)) {
                     if ((previous == null || !previous.includes(ACCESSED))) {
                         registerMethodAccessor(aMethod);
@@ -775,7 +771,7 @@ private void registerField(AccessCondition condition, ConfigurationMemberAccessi
                 abortIfSealed();
                 ElementData data = fd != null ? fd : new ElementData();
 
-                ConfigurationMemberAccessibility previous = data.registerAs(accessibility);
+                ConfigurationMemberAccessibility previous = data.register(accessibility, cnd, preserved);
                 if (previous == null) {
                     registerTypesForField(analysisField);
                 }
@@ -791,9 +787,6 @@ private void registerField(AccessCondition condition, ConfigurationMemberAccessi
                         checkHidingFields(analysisField);
                     }
                 }
-                if (accessibility.includes(QUERIED)) {
-                    data.updateDynamicAccessMetadata(cnd, preserved, accessibility);
-                }
                 if (accessibility.includes(ACCESSED)) {
                     if (previous == null || !previous.includes(ACCESSED)) {
                         /*
@@ -1916,23 +1909,31 @@ private static class ElementData {
         /* Query metadata keeps members discoverable but must not satisfy guarded access. */
         boolean accessMetadata = false;
 
-        ConfigurationMemberAccessibility registerAs(ConfigurationMemberAccessibility newAccessibility) {
+        /*
+         * Registration tasks and feature queries run concurrently during analysis. Publish the
+         * accessibility and its dynamic-access metadata atomically so readers cannot observe a
+         * queried element before the corresponding metadata is installed.
+         */
+        synchronized ConfigurationMemberAccessibility register(ConfigurationMemberAccessibility newAccessibility, AccessCondition condition, boolean preserved) {
             ConfigurationMemberAccessibility previous = accessibility;
             if (previous == null || !previous.includes(newAccessibility)) {
                 accessibility = newAccessibility;
             }
+            if (newAccessibility.includes(QUERIED)) {
+                updateDynamicAccessMetadata(condition, preserved, newAccessibility);
+            }
             return previous;
         }
 
-        boolean isRegisteredAs(ConfigurationMemberAccessibility target) {
+        synchronized boolean isRegisteredAs(ConfigurationMemberAccessibility target) {
             return accessibility != null && accessibility.includes(target);
         }
 
-        ConfigurationMemberAccessibility getAccessibility() {
+        synchronized ConfigurationMemberAccessibility getAccessibility() {
             return accessibility;
         }
 
-        void updateDynamicAccessMetadata(AccessCondition condition, boolean preserved, ConfigurationMemberAccessibility newAccessibility) {
+        private void updateDynamicAccessMetadata(AccessCondition condition, boolean preserved, ConfigurationMemberAccessibility newAccessibility) {
             boolean accessRegistration = newAccessibility.includes(ACCESSED);
             if (dynamicAccess == null || accessRegistration && !accessMetadata) {
                 dynamicAccess = null;
@@ -1947,7 +1948,7 @@ void updateDynamicAccessMetadata(AccessCondition condition, boolean preserved, C
             dynamicAccess = RuntimeDynamicAccessMetadata.addCondition(dynamicAccess, condition, true).withPreserved(metadataPreserved);
         }
 
-        RuntimeDynamicAccessMetadata getDynamicAccessMetadata() {
+        synchronized RuntimeDynamicAccessMetadata getDynamicAccessMetadata() {
             VMError.guarantee((dynamicAccess != null) == isRegisteredAs(QUERIED), "Dynamic access metadata should be present on queried elements");
             return dynamicAccess != null ? dynamicAccess : RuntimeDynamicAccessMetadata.alwaysAvailable(false);
         }