Overlay: Add discarding of all Java base properties

kaspersv · kaspersv · commit aaf51b293806 · 2025-07-10T11:25:00.000+02:00
diff --git a/java/ql/lib/semmle/code/java/Overlay.qll b/java/ql/lib/semmle/code/java/Overlay.qll
@@ -81,3 +81,21 @@ private predicate discardReferableLocatable(@locatable el) {
     not drl.existsInOverlay()
   )
 }
+
+overlay[local]
+private predicate baseConfigLocatable(@configLocatable l) { not isOverlay() and l = l }
+
+overlay[local]
+private predicate overlayHasConfigLocatables() {
+  isOverlay() and
+  exists(@configLocatable el)
+}
+
+overlay[discard_entity]
+private predicate discardBaseConfigLocatable(@configLocatable el) {
+  // The properties extractor is currently not incremental, so if
+  // the overlay contains any config locatables, the overlay should
+  // contain a full extraction and all config locatables from base
+  // should be discarded.
+  baseConfigLocatable(el) and overlayHasConfigLocatables()
+}
