Skip to content

Commit 76fd424

Browse files
committed
C#: Turn isAutogenerated predicate into a predicate without result.
1 parent 2dc35c1 commit 76fd424

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ module Public {
221221
predicate clearsContent(ParameterPosition pos, ContentSet content) { none() }
222222

223223
/**
224-
* Gets whether the summary is auto generated or not.
224+
* Holds if the summary is auto generated.
225225
*/
226-
boolean isAutoGenerated() { result = false }
226+
predicate isAutoGenerated() { none() }
227227
}
228228
}
229229

@@ -904,7 +904,7 @@ module Private {
904904
)
905905
}
906906

907-
override boolean isAutoGenerated() { summaryElement(this, _, _, _, result) }
907+
override predicate isAutoGenerated() { summaryElement(this, _, _, _, true) }
908908
}
909909

910910
/** Holds if component `c` of specification `spec` cannot be parsed. */
@@ -1059,10 +1059,8 @@ module Private {
10591059
preservesValue = false and result = "taint"
10601060
}
10611061

1062-
private string renderGenerated(boolean generated) {
1063-
generated = true and result = "generated:"
1064-
or
1065-
generated = false and result = ""
1062+
private string renderGenerated(RelevantSummarizedCallable c) {
1063+
if c.isAutoGenerated() then result = "generated:" else result = ""
10661064
}
10671065

10681066
/**
@@ -1078,7 +1076,7 @@ module Private {
10781076
c.relevantSummary(input, output, preservesValue) and
10791077
csv =
10801078
c.getCallableCsv() + getComponentStackCsv(input) + ";" + getComponentStackCsv(output) +
1081-
";" + renderGenerated(c.isAutoGenerated()) + renderKind(preservesValue)
1079+
";" + renderGenerated(c) + renderKind(preservesValue)
10821080
)
10831081
}
10841082
}

java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ module Public {
221221
predicate clearsContent(ParameterPosition pos, ContentSet content) { none() }
222222

223223
/**
224-
* Gets whether the summary is auto generated or not.
224+
* Holds if the summary is auto generated.
225225
*/
226-
boolean isAutoGenerated() { result = false }
226+
predicate isAutoGenerated() { none() }
227227
}
228228
}
229229

@@ -904,7 +904,7 @@ module Private {
904904
)
905905
}
906906

907-
override boolean isAutoGenerated() { summaryElement(this, _, _, _, result) }
907+
override predicate isAutoGenerated() { summaryElement(this, _, _, _, true) }
908908
}
909909

910910
/** Holds if component `c` of specification `spec` cannot be parsed. */
@@ -1059,10 +1059,8 @@ module Private {
10591059
preservesValue = false and result = "taint"
10601060
}
10611061

1062-
private string renderGenerated(boolean generated) {
1063-
generated = true and result = "generated:"
1064-
or
1065-
generated = false and result = ""
1062+
private string renderGenerated(RelevantSummarizedCallable c) {
1063+
if c.isAutoGenerated() then result = "generated:" else result = ""
10661064
}
10671065

10681066
/**
@@ -1078,7 +1076,7 @@ module Private {
10781076
c.relevantSummary(input, output, preservesValue) and
10791077
csv =
10801078
c.getCallableCsv() + getComponentStackCsv(input) + ";" + getComponentStackCsv(output) +
1081-
";" + renderGenerated(c.isAutoGenerated()) + renderKind(preservesValue)
1079+
";" + renderGenerated(c) + renderKind(preservesValue)
10821080
)
10831081
}
10841082
}

ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ module Public {
221221
predicate clearsContent(ParameterPosition pos, ContentSet content) { none() }
222222

223223
/**
224-
* Gets whether the summary is auto generated or not.
224+
* Holds if the summary is auto generated.
225225
*/
226-
boolean isAutoGenerated() { result = false }
226+
predicate isAutoGenerated() { none() }
227227
}
228228
}
229229

@@ -904,7 +904,7 @@ module Private {
904904
)
905905
}
906906

907-
override boolean isAutoGenerated() { summaryElement(this, _, _, _, result) }
907+
override predicate isAutoGenerated() { summaryElement(this, _, _, _, true) }
908908
}
909909

910910
/** Holds if component `c` of specification `spec` cannot be parsed. */
@@ -1059,10 +1059,8 @@ module Private {
10591059
preservesValue = false and result = "taint"
10601060
}
10611061

1062-
private string renderGenerated(boolean generated) {
1063-
generated = true and result = "generated:"
1064-
or
1065-
generated = false and result = ""
1062+
private string renderGenerated(RelevantSummarizedCallable c) {
1063+
if c.isAutoGenerated() then result = "generated:" else result = ""
10661064
}
10671065

10681066
/**
@@ -1078,7 +1076,7 @@ module Private {
10781076
c.relevantSummary(input, output, preservesValue) and
10791077
csv =
10801078
c.getCallableCsv() + getComponentStackCsv(input) + ";" + getComponentStackCsv(output) +
1081-
";" + renderGenerated(c.isAutoGenerated()) + renderKind(preservesValue)
1079+
";" + renderGenerated(c) + renderKind(preservesValue)
10821080
)
10831081
}
10841082
}

0 commit comments

Comments
 (0)