C++: IR field flow #3118
C++: Remove PositionalArgumentWithoutWriteSideEffectNode (since not a…
…ll arguments need a PostUpdateNode). Also generalized the added flow rule in simpleLocalFlowStep since there isn't always a ChiInstruction - for instance of it's a write to a struct that only has a single field.
- Loading branch information
commit fbef146a497e492d3cc5deb877c6b0f147421c34
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -218,7 +218,17 @@ abstract class PostUpdateNode extends InstructionNode { | |
| override string toString() { result = getPreUpdateNode().toString() + " [post update]" } | ||
| } | ||
|
|
||
| abstract private class PartialDefinitionNode extends PostUpdateNode, TInstructionNode { | ||
| final Instruction getInstructionOrChi() { | ||
| exists(ChiInstruction chi | | ||
| // TODO: This should be a non-conflated ChiInstruction once #3123 is merged | ||
| chi.getPartial() = getInstruction() and | ||
| result = chi | ||
| ) | ||
| or | ||
| result = getInstruction() | ||
| } | ||
| } | ||
|
|
||
| class ExplicitFieldStoreQualifierNode extends PartialDefinitionNode { | ||
| override StoreInstruction instr; | ||
|
|
@@ -268,22 +278,6 @@ class DefinitionByReferenceNode extends PartialDefinitionNode { | |
| override string toString() { result = "ref arg " + getPreUpdateNode().toString() } | ||
| } | ||
|
|
||
| /** | ||
| * A `Node` corresponding to a variable in the program, as opposed to the | ||
| * value of that variable at some particular point. This can be used for | ||
|
|
@@ -365,10 +359,10 @@ predicate localFlowStep(Node nodeFrom, Node nodeTo) { simpleLocalFlowStep(nodeFr | |
| predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) { | ||
| simpleInstructionLocalFlowStep(nodeFrom.asInstruction(), nodeTo.asInstruction()) | ||
| or | ||
| exists(LoadInstruction load | | ||
| // TODO: These can probably be getSourceValue() after #3112 is merged | ||
| load.getSourceValueOperand().getAnyDef() = | ||
| nodeFrom.(PartialDefinitionNode).getInstructionOrChi() and | ||
| nodeTo.asInstruction() = load.getSourceAddress().(FieldAddressInstruction).getObjectAddress() | ||
| ) | ||
|
Contributor
There was a problem hiding this comment. You can move this case into
Contributor
Author
There was a problem hiding this comment. I've done this now in d56284f. This case I've added in |
||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's now merged (that's the line I meant to comment on a minute ago).
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sadly my comment turned out to be incorrect. The flow in the following program is not captured by only following exact
Chioperands:since the load on
b->conly is a total overlap.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then you'll want to merge #3097 and use
isResultConflatedhere.