hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 01:33:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

C++: Move conflation check into each disjunct.

Browse Source
This commit is contained in:
Mathias Vorreiter Pedersen
2020-12-22 16:56:30 +01:00
parent d2d8377e88
commit 6545d0b53a
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
View File

@@ -744,27 +744,27 @@ private FieldNode getOutermostFieldNode(Instruction address) {
private predicate flowIntoReadNode(Node nodeFrom, FieldNode nodeTo) {
// flow from the memory of a load to the "outermost" field of that load.
not nodeFrom.asInstruction().isResultConflated() and
(
exists(LoadInstruction load |
nodeTo = getOutermostFieldNode(load.getSourceAddress()) and
nodeFrom.asInstruction() = load.getSourceValueOperand().getAnyDef()
)
or
// We need this to make stores look like loads for the dataflow library. So when there's a store
// of the form x->y = z we need to make the field node corresponding to y look like it's reading
// from the memory of x.
exists(StoreInstruction store, ChiInstruction chi |
chi.getPartial() = store and
nodeTo = getOutermostFieldNode(store.getDestinationAddress()) and
nodeFrom.asInstruction() = chi.getTotal()
)
exists(LoadInstruction load |
nodeTo = getOutermostFieldNode(load.getSourceAddress()) and
not nodeFrom.asInstruction().isResultConflated() and
nodeFrom.asInstruction() = load.getSourceValueOperand().getAnyDef()
)
or
exists(ReadSideEffectInstruction read |
not read.getSideEffectOperand().getAnyDef().isResultConflated() and
// We need this to make stores look like loads for the dataflow library. So when there's a store
// of the form x->y = z we need to make the field node corresponding to y look like it's reading
// from the memory of x.
exists(StoreInstruction store, ChiInstruction chi |
chi.getPartial() = store and
nodeTo = getOutermostFieldNode(store.getDestinationAddress()) and
not nodeFrom.asInstruction().isResultConflated() and
nodeFrom.asInstruction() = chi.getTotal()
)
or
exists(ReadSideEffectInstruction read, SideEffectOperand sideEffect |
sideEffect = read.getSideEffectOperand() and
not sideEffect.getAnyDef().isResultConflated() and
nodeTo = getOutermostFieldNode(read.getArgumentDef()) and
nodeFrom.asOperand() = read.getSideEffectOperand()
nodeFrom.asOperand() = sideEffect
)
}