C#/C++: Autoformat post rebase.

This commit is contained in:
Anders Schack-Mulligen
2020-01-29 13:16:46 +01:00
parent 726a873c3e
commit 0d4b2e4bf7
6 changed files with 20 additions and 19 deletions

View File

@@ -161,7 +161,8 @@ private predicate instructionTaintStep(Instruction i1, Instruction i2) {
i2.(PointerAddInstruction).getLeft() = i1
or
// Flow from argument to return value
i2 = any(CallInstruction call |
i2 =
any(CallInstruction call |
exists(int indexIn |
modelTaintToReturnValue(call.getStaticCallTarget(), indexIn) and
i1 = getACallArgumentOrIndirection(call, indexIn)
@@ -173,7 +174,8 @@ private predicate instructionTaintStep(Instruction i1, Instruction i2) {
// together in a single virtual variable.
// TODO: Will this work on the test for `TaintedPath.ql`, where the output arg
// is a pointer addition expression?
i2 = any(WriteSideEffectInstruction outNode |
i2 =
any(WriteSideEffectInstruction outNode |
exists(CallInstruction call, int indexIn, int indexOut |
modelTaintToParameter(call.getStaticCallTarget(), indexIn, indexOut) and
i1 = getACallArgumentOrIndirection(call, indexIn) and

View File

@@ -92,7 +92,8 @@ private module VirtualDispatch {
)
or
exists(Variable var, FieldAccess a |
var = store
var =
store
.getDestinationAddress()
.(FieldAddressInstruction)
.getObjectAddress()

View File

@@ -115,10 +115,10 @@ class PropertyProvider extends IRPropertyProvider {
MemoryLocation useLocation, IRBlock predBlock, IRBlock defBlock, int defIndex, Overlap overlap
|
hasPhiOperandDefinition(_, useLocation, block, predBlock, defBlock, defIndex) and
key = "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() +
"]" and
result = defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() +
")"
key =
"PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() + "]" and
result =
defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() + ")"
)
or
key = "LiveOnEntry" and

View File

@@ -52,10 +52,8 @@ abstract class TranslatedLocalVariableDeclaration extends TranslatedVariableInit
final override Type getTargetType() { result = getVariableType(getVariable()) }
final override TranslatedInitialization getInitialization() {
result = getTranslatedInitialization(getVariable()
.getInitializer()
.getExpr()
.getFullyConverted())
result =
getTranslatedInitialization(getVariable().getInitializer().getExpr().getFullyConverted())
}
final override Instruction getInitializationSuccessor() {

View File

@@ -115,10 +115,10 @@ class PropertyProvider extends IRPropertyProvider {
MemoryLocation useLocation, IRBlock predBlock, IRBlock defBlock, int defIndex, Overlap overlap
|
hasPhiOperandDefinition(_, useLocation, block, predBlock, defBlock, defIndex) and
key = "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() +
"]" and
result = defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() +
")"
key =
"PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() + "]" and
result =
defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() + ")"
)
or
key = "LiveOnEntry" and