Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2f0c36a

Browse files
kaspersvkaspersv
authored
Merge pull request #13079 from kaspersv/kaspersv/csharp-explicit-this-receivers3
C#: Make implicit this receivers explicit
2 parents c3191e9 + 3041fde commit 2f0c36a

23 files changed

Lines changed: 125 additions & 119 deletions

File tree

‎csharp/ql/lib/Linq/Helpers.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ predicate missedWhereOpportunity(ForeachStmt fes, IfStmt is) {
128128
class AnyCall extends MethodCall {
129129
AnyCall() {
130130
exists(Method m |
131-
m = getTarget().getUnboundDeclaration() and
131+
m = this.getTarget().getUnboundDeclaration() and
132132
isEnumerableType(m.getDeclaringType()) and
133133
m.hasName("Any<>")
134134
)
@@ -139,7 +139,7 @@ class AnyCall extends MethodCall {
139139
class CountCall extends MethodCall {
140140
CountCall() {
141141
exists(Method m |
142-
m = getTarget().getUnboundDeclaration() and
142+
m = this.getTarget().getUnboundDeclaration() and
143143
isEnumerableType(m.getDeclaringType()) and
144144
m.hasName("Count<>")
145145
)
@@ -148,19 +148,19 @@ class CountCall extends MethodCall {
148148

149149
/** A variable of type IEnumerable&lt;T>, for some T. */
150150
class IEnumerableSequence extends Variable {
151-
IEnumerableSequence() { isIEnumerableType(getType()) }
151+
IEnumerableSequence() { isIEnumerableType(this.getType()) }
152152
}
153153

154154
/** A LINQ Select(...) call. */
155155
class SelectCall extends ExtensionMethodCall {
156156
SelectCall() {
157157
exists(Method m |
158-
m = getTarget().getUnboundDeclaration() and
158+
m = this.getTarget().getUnboundDeclaration() and
159159
isEnumerableType(m.getDeclaringType()) and
160160
m.hasName("Select<,>")
161161
)
162162
}
163163

164164
/** Gets the anonymous function expression supplied as the argument to the Select (if possible). */
165-
AnonymousFunctionExpr getFunctionExpr() { result = getArgument(1) }
165+
AnonymousFunctionExpr getFunctionExpr() { result = this.getArgument(1) }
166166
}

‎csharp/ql/lib/semmle/code/cil/Handler.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ class Handler extends Element, EntryPoint, @cil_handler {
3838
* Holds if the instruction `i` is in the scope of this handler.
3939
*/
4040
predicate isInScope(Instruction i) {
41-
i.getImplementation() = getImplementation() and
42-
i.getIndex() in [getTryStart().getIndex() .. getTryEnd().getIndex()]
41+
i.getImplementation() = this.getImplementation() and
42+
i.getIndex() in [this.getTryStart().getIndex() .. this.getTryEnd().getIndex()]
4343
}
4444

4545
override string toString() { none() }
4646

4747
override Instruction getASuccessorType(FlowType t) {
48-
result = getHandlerStart() and
48+
result = this.getHandlerStart() and
4949
t instanceof NormalFlow
5050
}
5151

5252
/** Gets the type of the caught exception, if any. */
5353
Type getCaughtType() { cil_handler_type(this, result) }
5454

55-
override Location getLocation() { result = getTryStart().getLocation() }
55+
override Location getLocation() { result = this.getTryStart().getLocation() }
5656
}
5757

5858
/** A handler corresponding to a `finally` block. */
@@ -72,7 +72,7 @@ class FilterHandler extends Handler, @cil_filter_handler {
7272

7373
/** A handler corresponding to a `catch` clause. */
7474
class CatchHandler extends Handler, @cil_catch_handler {
75-
override string toString() { result = "catch(" + getCaughtType().getName() + ") {...}" }
75+
override string toString() { result = "catch(" + this.getCaughtType().getName() + ") {...}" }
7676

7777
override int getPushCount() { result = 1 }
7878
}

‎csharp/ql/lib/semmle/code/csharp/Comments.qll‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -70,28 +70,28 @@ class XmlCommentLine extends CommentLine, @xmldoccomment {
7070
override string toString() { result = "/// ..." }
7171

7272
private string xmlAttributeRegex() {
73-
result = "(" + xmlIdentifierRegex() + ")(?:\\s*=\\s*[\"']([^\"']*)[\"'])"
73+
result = "(" + this.xmlIdentifierRegex() + ")(?:\\s*=\\s*[\"']([^\"']*)[\"'])"
7474
}
7575

7676
private string xmlIdentifierRegex() { result = "\\w+" }
7777

78-
private string xmlTagOpenRegex() { result = "<\\s*" + xmlIdentifierRegex() }
78+
private string xmlTagOpenRegex() { result = "<\\s*" + this.xmlIdentifierRegex() }
7979

8080
private string xmlTagIntroRegex() {
81-
result = xmlTagOpenRegex() + "(?:\\s*" + xmlAttributeRegex() + ")*"
81+
result = this.xmlTagOpenRegex() + "(?:\\s*" + this.xmlAttributeRegex() + ")*"
8282
}
8383

84-
private string xmlTagCloseRegex() { result = "</\\s*" + xmlIdentifierRegex() + "\\s*>" }
84+
private string xmlTagCloseRegex() { result = "</\\s*" + this.xmlIdentifierRegex() + "\\s*>" }
8585

8686
/** Gets the text inside the XML element at character offset `offset`. */
8787
private string getElement(int offset) {
88-
result = getText().regexpFind(xmlTagIntroRegex(), _, offset)
88+
result = this.getText().regexpFind(this.xmlTagIntroRegex(), _, offset)
8989
}
9090

9191
/** Gets the name of the opening tag at offset `offset`. */
9292
string getOpenTag(int offset) {
9393
exists(int offset1, int offset2 |
94-
result = getElement(offset1).regexpFind(xmlIdentifierRegex(), 0, offset2) and
94+
result = this.getElement(offset1).regexpFind(this.xmlIdentifierRegex(), 0, offset2) and
9595
offset = offset1 + offset2
9696
)
9797
}
@@ -100,9 +100,9 @@ class XmlCommentLine extends CommentLine, @xmldoccomment {
100100
string getCloseTag(int offset) {
101101
exists(int offset1, int offset2 |
102102
result =
103-
getText()
104-
.regexpFind(xmlTagCloseRegex(), _, offset1)
105-
.regexpFind(xmlIdentifierRegex(), 0, offset2) and
103+
this.getText()
104+
.regexpFind(this.xmlTagCloseRegex(), _, offset1)
105+
.regexpFind(this.xmlIdentifierRegex(), 0, offset2) and
106106
offset = offset1 + offset2
107107
)
108108
}
@@ -112,14 +112,14 @@ class XmlCommentLine extends CommentLine, @xmldoccomment {
112112
exists(int offset1, int offset2 |
113113
(
114114
result =
115-
getText()
116-
.regexpFind(xmlTagIntroRegex() + "\\s*/>", _, offset1)
117-
.regexpFind(xmlIdentifierRegex(), 0, offset2) or
115+
this.getText()
116+
.regexpFind(this.xmlTagIntroRegex() + "\\s*/>", _, offset1)
117+
.regexpFind(this.xmlIdentifierRegex(), 0, offset2) or
118118
result =
119-
getText()
120-
.regexpFind(xmlTagIntroRegex() + "\\s*>\\s*</" + xmlIdentifierRegex() + "\\s*>", _,
121-
offset1)
122-
.regexpFind(xmlIdentifierRegex(), 0, offset2)
119+
this.getText()
120+
.regexpFind(this.xmlTagIntroRegex() + "\\s*>\\s*</" + this.xmlIdentifierRegex() +
121+
"\\s*>", _, offset1)
122+
.regexpFind(this.xmlIdentifierRegex(), 0, offset2)
123123
) and
124124
offset = offset1 + offset2
125125
)
@@ -130,18 +130,18 @@ class XmlCommentLine extends CommentLine, @xmldoccomment {
130130
* for a given XML attribute name `key` and element offset `offset`.
131131
*/
132132
string getAttribute(string element, string key, int offset) {
133-
exists(int offset1, int offset2, string elt, string pair | elt = getElement(offset1) |
134-
element = elt.regexpFind(xmlIdentifierRegex(), 0, offset2) and
133+
exists(int offset1, int offset2, string elt, string pair | elt = this.getElement(offset1) |
134+
element = elt.regexpFind(this.xmlIdentifierRegex(), 0, offset2) and
135135
offset = offset1 + offset2 and
136-
pair = elt.regexpFind(xmlAttributeRegex(), _, _) and
137-
key = pair.regexpCapture(xmlAttributeRegex(), 1) and
138-
result = pair.regexpCapture(xmlAttributeRegex(), 2)
136+
pair = elt.regexpFind(this.xmlAttributeRegex(), _, _) and
137+
key = pair.regexpCapture(this.xmlAttributeRegex(), 1) and
138+
result = pair.regexpCapture(this.xmlAttributeRegex(), 2)
139139
)
140140
}
141141

142142
/** Holds if the XML element at the given offset is not empty. */
143143
predicate hasBody(string element, int offset) {
144-
element = getOpenTag(offset) and not element = getEmptyTag(offset)
144+
element = this.getOpenTag(offset) and not element = this.getEmptyTag(offset)
145145
}
146146
}
147147

@@ -156,13 +156,13 @@ class XmlCommentLine extends CommentLine, @xmldoccomment {
156156
*/
157157
class CommentBlock extends @commentblock {
158158
/** Gets a textual representation of this comment block. */
159-
string toString() { result = getChild(0).toString() }
159+
string toString() { result = this.getChild(0).toString() }
160160

161161
/** Gets the location of this comment block */
162162
Location getLocation() { commentblock_location(this, result) }
163163

164164
/** Gets the number of lines in this comment block. */
165-
int getNumLines() { result = count(getAChild()) }
165+
int getNumLines() { result = count(this.getAChild()) }
166166

167167
/** Gets the `c`th child of this comment block (numbered from 0). */
168168
CommentLine getChild(int c) { commentblock_child(this, result, c) }
@@ -189,23 +189,23 @@ class CommentBlock extends @commentblock {
189189
Element getAnElement() { commentblock_binding(this, result, _) }
190190

191191
/** Gets a line of text in this comment block. */
192-
string getALine() { result = getAChild().getText() }
192+
string getALine() { result = this.getAChild().getText() }
193193

194194
/** Holds if the comment has no associated `Element`. */
195-
predicate isOrphan() { not exists(getElement()) }
195+
predicate isOrphan() { not exists(this.getElement()) }
196196

197197
/** Holds if this block consists entirely of XML comments. */
198198
predicate isXmlCommentBlock() {
199-
forall(CommentLine l | l = getAChild() | l instanceof XmlCommentLine)
199+
forall(CommentLine l | l = this.getAChild() | l instanceof XmlCommentLine)
200200
}
201201

202202
/** Gets a `CommentLine` containing text. */
203-
CommentLine getANonEmptyLine() { result = getAChild() and result.getText().length() != 0 }
203+
CommentLine getANonEmptyLine() { result = this.getAChild() and result.getText().length() != 0 }
204204

205205
/** Gets a `CommentLine` that might contain code. */
206206
CommentLine getAProbableCodeLine() {
207207
// Logic taken verbatim from Java query CommentedCode.qll
208-
result = getAChild() and
208+
result = this.getAChild() and
209209
exists(string trimmed | trimmed = result.getText().regexpReplaceAll("\\s*//.*$", "") |
210210
trimmed.matches("%;") or trimmed.matches("%{") or trimmed.matches("%}")
211211
)

‎csharp/ql/lib/semmle/code/csharp/commons/Compilation.qll‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,27 @@ class Compilation extends @compilation {
1313
Assembly getOutputAssembly() { compilation_assembly(this, result) }
1414

1515
/** Gets the folder in which this compilation was run. */
16-
Folder getFolder() { result.getAbsolutePath() = getDirectoryString() }
16+
Folder getFolder() { result.getAbsolutePath() = this.getDirectoryString() }
1717

1818
/** Gets the `i`th command line argument. */
1919
string getArgument(int i) { compilation_args(this, i, result) }
2020

2121
/** Gets the arguments as a concatenated string. */
22-
string getArguments() { result = concat(int i | exists(getArgument(i)) | getArgument(i), " ") }
22+
string getArguments() {
23+
result = concat(int i | exists(this.getArgument(i)) | this.getArgument(i), " ")
24+
}
2325

2426
/** Gets the 'i'th source file in this compilation. */
2527
File getFileCompiled(int i) { compilation_compiling_files(this, i, result) }
2628

2729
/** Gets a source file compiled in this compilation. */
28-
File getAFileCompiled() { result = getFileCompiled(_) }
30+
File getAFileCompiled() { result = this.getFileCompiled(_) }
2931

3032
/** Gets the `i`th reference in this compilation. */
3133
File getReference(int i) { compilation_referencing_files(this, i, result) }
3234

3335
/** Gets a reference in this compilation. */
34-
File getAReference() { result = getReference(_) }
36+
File getAReference() { result = this.getReference(_) }
3537

3638
/** Gets a diagnostic associated with this compilation. */
3739
Diagnostic getADiagnostic() { result.getCompilation() = this }
@@ -40,25 +42,25 @@ class Compilation extends @compilation {
4042
float getMetric(int metric) { compilation_time(this, -1, metric, result) }
4143

4244
/** Gets the CPU time of the compilation. */
43-
float getFrontendCpuSeconds() { result = getMetric(0) }
45+
float getFrontendCpuSeconds() { result = this.getMetric(0) }
4446

4547
/** Gets the elapsed time of the compilation. */
46-
float getFrontendElapsedSeconds() { result = getMetric(1) }
48+
float getFrontendElapsedSeconds() { result = this.getMetric(1) }
4749

4850
/** Gets the CPU time of the extraction. */
49-
float getExtractorCpuSeconds() { result = getMetric(2) }
51+
float getExtractorCpuSeconds() { result = this.getMetric(2) }
5052

5153
/** Gets the elapsed time of the extraction. */
52-
float getExtractorElapsedSeconds() { result = getMetric(3) }
54+
float getExtractorElapsedSeconds() { result = this.getMetric(3) }
5355

5456
/** Gets the user CPU time of the compilation. */
55-
float getFrontendUserCpuSeconds() { result = getMetric(4) }
57+
float getFrontendUserCpuSeconds() { result = this.getMetric(4) }
5658

5759
/** Gets the user CPU time of the extraction. */
58-
float getExtractorUserCpuSeconds() { result = getMetric(5) }
60+
float getExtractorUserCpuSeconds() { result = this.getMetric(5) }
5961

6062
/** Gets the peak working set of the extractor process in MB. */
61-
float getPeakWorkingSetMB() { result = getMetric(6) }
63+
float getPeakWorkingSetMB() { result = this.getMetric(6) }
6264

6365
/** Gets the CPU seconds for the entire extractor process. */
6466
float getCpuSeconds() { compilation_finished(this, result, _) }

‎csharp/ql/lib/semmle/code/csharp/commons/StructuralComparison.qll‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,5 +238,7 @@ abstract deprecated class StructuralComparisonConfiguration extends string {
238238
* flagged as candidates for structural equality, that is,
239239
* `candidate(x, y)` must hold.
240240
*/
241-
predicate same(ControlFlowElement x, ControlFlowElement y) { candidate(x, y) and sameGvn(x, y) }
241+
predicate same(ControlFlowElement x, ControlFlowElement y) {
242+
this.candidate(x, y) and sameGvn(x, y)
243+
}
242244
}

‎csharp/ql/lib/semmle/code/csharp/dispatch/RuntimeCallable.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class RuntimeCallable extends DotNet::Callable {
1616
RuntimeCallable() {
1717
not this.(Modifiable).isAbstract() and
1818
(
19-
not getDeclaringType() instanceof Interface or
19+
not this.getDeclaringType() instanceof Interface or
2020
this.(Virtualizable).isVirtual()
2121
)
2222
}
@@ -35,7 +35,7 @@ class RuntimeMethod extends RuntimeCallable {
3535

3636
/** A run-time instance method. */
3737
class RuntimeInstanceMethod extends RuntimeMethod {
38-
RuntimeInstanceMethod() { not isStatic() }
38+
RuntimeInstanceMethod() { not this.isStatic() }
3939
}
4040

4141
/** A run-time operator. */
@@ -46,5 +46,5 @@ class RuntimeAccessor extends Accessor, RuntimeCallable { }
4646

4747
/** A run-time instance accessor. */
4848
class RuntimeInstanceAccessor extends RuntimeAccessor {
49-
RuntimeInstanceAccessor() { not isStatic() }
49+
RuntimeInstanceAccessor() { not this.isStatic() }
5050
}

‎csharp/ql/lib/semmle/code/csharp/exprs/ComparisonOperation.qll‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ class RelationalOperation extends ComparisonOperation, @rel_op_expr {
6868
class GTExpr extends RelationalOperation, @gt_expr {
6969
override string getOperator() { result = ">" }
7070

71-
override Expr getGreaterOperand() { result = getLeftOperand() }
71+
override Expr getGreaterOperand() { result = this.getLeftOperand() }
7272

73-
override Expr getLesserOperand() { result = getRightOperand() }
73+
override Expr getLesserOperand() { result = this.getRightOperand() }
7474

7575
override string getAPrimaryQlClass() { result = "GTExpr" }
7676
}
@@ -81,9 +81,9 @@ class GTExpr extends RelationalOperation, @gt_expr {
8181
class LTExpr extends RelationalOperation, @lt_expr {
8282
override string getOperator() { result = "<" }
8383

84-
override Expr getGreaterOperand() { result = getRightOperand() }
84+
override Expr getGreaterOperand() { result = this.getRightOperand() }
8585

86-
override Expr getLesserOperand() { result = getLeftOperand() }
86+
override Expr getLesserOperand() { result = this.getLeftOperand() }
8787

8888
override string getAPrimaryQlClass() { result = "LTExpr" }
8989
}
@@ -94,9 +94,9 @@ class LTExpr extends RelationalOperation, @lt_expr {
9494
class GEExpr extends RelationalOperation, @ge_expr {
9595
override string getOperator() { result = ">=" }
9696

97-
override Expr getGreaterOperand() { result = getLeftOperand() }
97+
override Expr getGreaterOperand() { result = this.getLeftOperand() }
9898

99-
override Expr getLesserOperand() { result = getRightOperand() }
99+
override Expr getLesserOperand() { result = this.getRightOperand() }
100100

101101
override string getAPrimaryQlClass() { result = "GEExpr" }
102102
}
@@ -107,9 +107,9 @@ class GEExpr extends RelationalOperation, @ge_expr {
107107
class LEExpr extends RelationalOperation, @le_expr {
108108
override string getOperator() { result = "<=" }
109109

110-
override Expr getGreaterOperand() { result = getRightOperand() }
110+
override Expr getGreaterOperand() { result = this.getRightOperand() }
111111

112-
override Expr getLesserOperand() { result = getLeftOperand() }
112+
override Expr getLesserOperand() { result = this.getLeftOperand() }
113113

114114
override string getAPrimaryQlClass() { result = "LEExpr" }
115115
}

‎csharp/ql/lib/semmle/code/csharp/security/cryptography/EncryptionKeyDataFlowQuery.qll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ private import semmle.code.csharp.frameworks.system.security.cryptography.Symmet
77

88
/** Array of type Byte */
99
deprecated class ByteArray extends ArrayType {
10-
ByteArray() { getElementType() instanceof ByteType }
10+
ByteArray() { this.getElementType() instanceof ByteType }
1111
}
1212

1313
/** Abstract class for all sources of keys */
@@ -31,7 +31,7 @@ abstract class KeySanitizer extends DataFlow::ExprNode { }
3131
*/
3232
class SymmetricEncryptionKeyPropertySink extends SymmetricEncryptionKeySink {
3333
SymmetricEncryptionKeyPropertySink() {
34-
exists(SymmetricAlgorithm ag | asExpr() = ag.getKeyProperty().getAnAssignedValue())
34+
exists(SymmetricAlgorithm ag | this.asExpr() = ag.getKeyProperty().getAnAssignedValue())
3535
}
3636

3737
override string getDescription() { result = "Key property assignment" }
@@ -43,7 +43,7 @@ class SymmetricEncryptionKeyPropertySink extends SymmetricEncryptionKeySink {
4343
class SymmetricEncryptionCreateEncryptorSink extends SymmetricEncryptionKeySink {
4444
SymmetricEncryptionCreateEncryptorSink() {
4545
exists(SymmetricAlgorithm ag, MethodCall mc | mc = ag.getASymmetricEncryptor() |
46-
asExpr() = mc.getArgumentForName("rgbKey")
46+
this.asExpr() = mc.getArgumentForName("rgbKey")
4747
)
4848
}
4949

@@ -56,7 +56,7 @@ class SymmetricEncryptionCreateEncryptorSink extends SymmetricEncryptionKeySink
5656
class SymmetricEncryptionCreateDecryptorSink extends SymmetricEncryptionKeySink {
5757
SymmetricEncryptionCreateDecryptorSink() {
5858
exists(SymmetricAlgorithm ag, MethodCall mc | mc = ag.getASymmetricDecryptor() |
59-
asExpr() = mc.getArgumentForName("rgbKey")
59+
this.asExpr() = mc.getArgumentForName("rgbKey")
6060
)
6161
}
6262

0 commit comments

Comments
 (0)