Skip to content

Commit 039b2ec

Browse files
authored
Merge pull request #18457 from hvitved/dataflow/disallowed-return-inline-late
Data flow: Fix a bad join order
2 parents 204afab + 91b6a65 commit 039b2ec

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,12 +595,18 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
595595
}
596596

597597
pragma[nomagic]
598-
private ReturnKindExtOption getDisallowedReturnKind(ParamNodeEx p) {
598+
private ReturnKindExtOption getDisallowedReturnKind0(ParamNodeEx p) {
599599
if allowParameterReturnInSelfEx(p)
600600
then result.isNone()
601601
else p.isParameterOf(_, result.asSome().(ParamUpdateReturnKind).getPosition())
602602
}
603603

604+
bindingset[p]
605+
pragma[inline_late]
606+
private ReturnKindExtOption getDisallowedReturnKind(ParamNodeEx p) {
607+
result = getDisallowedReturnKind0(p)
608+
}
609+
604610
/**
605611
* Holds if an argument to `call` is reached in the flow covered by `fwdFlow`.
606612
*/

0 commit comments

Comments
 (0)