C++: One more join order fix

rdmarsh2 · rdmarsh2 · commit 9ac55aff0e17 · 2021-05-06T17:43:28.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -656,7 +656,7 @@ private predicate simpleOperandLocalFlowStep(Instruction iFrom, Operand opTo) {
   exists(LoadInstruction load |
     load.getSourceValueOperand() = opTo and
     opTo.getAnyDef() = iFrom and
-    isSingleFieldClass(iFrom.getResultType(), opTo)
+    isSingleFieldClass(pragma[only_bind_out](pragma[only_bind_out](iFrom).getResultType()), opTo)
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ private predicate simpleOperandLocalFlowStep(Instruction iFrom, Operand opTo) {`
`656`	`656`	`exists(LoadInstruction load \|`
`657`	`657`	`load.getSourceValueOperand() = opTo and`
`658`	`658`	`opTo.getAnyDef() = iFrom and`
`659`		`- isSingleFieldClass(iFrom.getResultType(), opTo)`
	`659`	`+ isSingleFieldClass(pragma[only_bind_out](pragma[only_bind_out](iFrom).getResultType()), opTo)`
`660`	`660`	`)`
`661`	`661`	`}`
`662`	`662`