Dataflow: Avoid duplication in fwdFlow1 disjunction.

aschackmull · aschackmull · commit 2597ef651be9 · 2025-02-04T10:47:00.000+01:00
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -415,7 +415,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         private predicate compatibleContainer0(ApHeadContent apc, DataFlowType containerType) {
           exists(DataFlowType containerType0, Content c |
             PrevStage::storeStepCand(_, c, _, _, containerType0) and
-            not isTopType(containerType0) and
+            not topTypeContent(apc) and
             compatibleTypesCached(containerType0, containerType) and
             apc = projectToHeadContent(c)
           )

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {`
`415`	`415`	`private predicate compatibleContainer0(ApHeadContent apc, DataFlowType containerType) {`
`416`	`416`	`exists(DataFlowType containerType0, Content c \|`
`417`	`417`	`PrevStage::storeStepCand(_, c, _, _, containerType0) and`
`418`		`- not isTopType(containerType0) and`
	`418`	`+ not topTypeContent(apc) and`
`419`	`419`	`compatibleTypesCached(containerType0, containerType) and`
`420`	`420`	`apc = projectToHeadContent(c)`
`421`	`421`	`)`