hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-03 04:39:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix how non existing locations are accounted for

Browse Source
This commit is contained in:
Paolo Tranquilli
2021-11-23 15:27:13 +00:00
committed by GitHub
parent 9538ac73e4
commit 055017de49
5 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
View File

@@ -20,6 +20,14 @@ private import internal.OperandInternal
private class TStageOperand =
TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
/**
* A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
* opposed to testing `not loc isntanceof UnknownLocation`
*/
private class KnownLocation extends Language::Location {
KnownLocation() { not this instanceof Language::UnknownLocation }
}
/**
* An operand of an `Instruction`. The operand represents a use of the result of one instruction
* (the defining instruction) in another instruction (the use instruction)
@@ -414,17 +422,11 @@ class ThisArgumentOperand extends ArgumentOperand {
override ThisArgumentOperandTag tag;
// in most cases the def location makes more sense, but in some corner cases it
// does not have a location: in those cases we fall back to the use location
// has an unknown location: in those cases we fall back to the use location
override Language::Location getLocation() {
result = selectLocation(this.getAnyDef().getLocation(), this.getUse().getLocation())
}
private Language::Location selectLocation(
Language::Location preferred, Language::Location fallback
) {
if not exists(preferred) or preferred instanceof Language::UnknownLocation
then result = fallback
else result = preferred
if this.getAnyDef().getLocation() instanceof KnownLocation
then result = this.getAnyDef().getLocation()
else result = this.getUse().getLocation()
}
}

22
csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
View File

@@ -20,6 +20,14 @@ private import internal.OperandInternal
private class TStageOperand =
TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
/**
* A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
* opposed to testing `not loc isntanceof UnknownLocation`
*/
private class KnownLocation extends Language::Location {
KnownLocation() { not this instanceof Language::UnknownLocation }
}
/**
* An operand of an `Instruction`. The operand represents a use of the result of one instruction
* (the defining instruction) in another instruction (the use instruction)
@@ -414,17 +422,11 @@ class ThisArgumentOperand extends ArgumentOperand {
override ThisArgumentOperandTag tag;
// in most cases the def location makes more sense, but in some corner cases it
// does not have a location: in those cases we fall back to the use location
// has an unknown location: in those cases we fall back to the use location
override Language::Location getLocation() {
result = selectLocation(this.getAnyDef().getLocation(), this.getUse().getLocation())
}
private Language::Location selectLocation(
Language::Location preferred, Language::Location fallback
) {
if not exists(preferred) or preferred instanceof Language::UnknownLocation
then result = fallback
else result = preferred
if this.getAnyDef().getLocation() instanceof KnownLocation
then result = this.getAnyDef().getLocation()
else result = this.getUse().getLocation()
}
}