Skip to content

Commit 730871c

Browse files
committed
Swift: Deprecate BarrierGuard.
1 parent a7c268f commit 730871c

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -153,22 +153,10 @@ class ContentSet extends Content {
153153
}
154154

155155
/**
156-
* A guard that validates some expression.
157-
*
158-
* To use this in a configuration, extend the class and provide a
159-
* characteristic predicate precisely specifying the guard, and override
160-
* `checks` to specify what is being validated and in which branch.
161-
*
162-
* It is important that all extending classes in scope are disjoint.
156+
* DEPRECATED: Do not use.
163157
*/
164-
abstract class BarrierGuard extends DataFlowExpr {
158+
abstract deprecated class BarrierGuard extends DataFlowExpr {
165159
BarrierGuard() { none() }
166160

167-
/** Holds if this guard controls block `b` upon evaluating to `branch`. */
168-
private predicate controlsBlock(BasicBlock bb, boolean branch) { none() }
169-
170-
/** Holds if this guard validates `expr` upon evaluating to `branch`. */
171-
abstract predicate checks(ControlFlowNode expr, boolean branch);
172-
173161
final Node getAGuardedNode() { none() }
174162
}

swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ private import codeql.swift.dataflow.DataFlow
99
*/
1010
predicate defaultTaintSanitizer(DataFlow::Node node) { none() }
1111

12-
/**
13-
* Holds if `guard` should be a sanitizer guard in all global taint flow configurations
14-
* but not in local taint.
15-
*/
16-
predicate defaultTaintSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
17-
1812
cached
1913
private module Cached {
2014
/**

0 commit comments

Comments
 (0)