[GR-62989] Remove NEGATIVE_QUERY from registeredResources in Build Report data when it was replaced with an actual resource

PullRequest: graal/20554

Author: dnestoro

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/EmbeddedResourcesInfo.java

@@ -56,6 +56,18 @@ public void declareResourceAsRegistered(Module module, String resource, String s
         }
 
         Resources.ModuleResourceKey key = Resources.createStorageKey(module, resource);
+
+        /*
+         * If we already have an entry with this key, and it was a NEGATIVE_QUERY, the new resource
+         * would either be ignored if it was another NEGATIVE_QUERY or it will override existing
+         * NEGATIVE_QUERY for that key. In both cases we can remove previous NEGATIVE_QUERY since it
+         * will be replaced with either new NEGATIVE_QUERY or with resource that exists.
+         */
+        List<SourceAndOrigin> existingEntries = registeredResources.get(key);
+        if (existingEntries != null && existingEntries.size() == 1 && isNegativeQuery(existingEntries.get(0))) {
+            registeredResources.remove(key);
+        }
+
         registeredResources.compute(key, (k, v) -> {
             if (v == null) {
                 ArrayList<SourceAndOrigin> newValue = new ArrayList<>();
@@ -83,4 +95,8 @@ public void declareResourceAsRegistered(Module module, String resource, String s
             return v;
         });
     }
+
+    private static boolean isNegativeQuery(SourceAndOrigin entry) {
+        return entry.source().equalsIgnoreCase("") && ((String) entry.origin()).equalsIgnoreCase("");
+    }
 }