Skip to content

Commit 67fd38f

Browse files
committed
C#/Ruby: Use a 'noinline' instead of a 'only_bind_into'.
1 parent 4b137ed commit 67fd38f

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ private predicate dominatesPredecessor(BasicBlock bb1, BasicBlock bb2) {
156156
}
157157

158158
/** Holds if `df` is in the dominance frontier of `bb`. */
159+
pragma[noinline]
159160
private predicate inDominanceFrontier(BasicBlock bb, BasicBlock df) {
160161
dominatesPredecessor(bb, df) and
161162
not strictlyDominates(bb, df)
@@ -169,7 +170,7 @@ pragma[noinline]
169170
private predicate inDefDominanceFrontier(BasicBlock bb, SourceVariable v) {
170171
exists(BasicBlock defbb, Definition def |
171172
def.definesAt(v, defbb, _) and
172-
inDominanceFrontier(pragma[only_bind_into](defbb), bb)
173+
inDominanceFrontier(defbb, bb)
173174
)
174175
}
175176

csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ private predicate dominatesPredecessor(BasicBlock bb1, BasicBlock bb2) {
156156
}
157157

158158
/** Holds if `df` is in the dominance frontier of `bb`. */
159+
pragma[noinline]
159160
private predicate inDominanceFrontier(BasicBlock bb, BasicBlock df) {
160161
dominatesPredecessor(bb, df) and
161162
not strictlyDominates(bb, df)
@@ -169,7 +170,7 @@ pragma[noinline]
169170
private predicate inDefDominanceFrontier(BasicBlock bb, SourceVariable v) {
170171
exists(BasicBlock defbb, Definition def |
171172
def.definesAt(v, defbb, _) and
172-
inDominanceFrontier(pragma[only_bind_into](defbb), bb)
173+
inDominanceFrontier(defbb, bb)
173174
)
174175
}
175176

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ private predicate dominatesPredecessor(BasicBlock bb1, BasicBlock bb2) {
156156
}
157157

158158
/** Holds if `df` is in the dominance frontier of `bb`. */
159+
pragma[noinline]
159160
private predicate inDominanceFrontier(BasicBlock bb, BasicBlock df) {
160161
dominatesPredecessor(bb, df) and
161162
not strictlyDominates(bb, df)
@@ -169,7 +170,7 @@ pragma[noinline]
169170
private predicate inDefDominanceFrontier(BasicBlock bb, SourceVariable v) {
170171
exists(BasicBlock defbb, Definition def |
171172
def.definesAt(v, defbb, _) and
172-
inDominanceFrontier(pragma[only_bind_into](defbb), bb)
173+
inDominanceFrontier(defbb, bb)
173174
)
174175
}
175176

csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ private predicate dominatesPredecessor(BasicBlock bb1, BasicBlock bb2) {
156156
}
157157

158158
/** Holds if `df` is in the dominance frontier of `bb`. */
159+
pragma[noinline]
159160
private predicate inDominanceFrontier(BasicBlock bb, BasicBlock df) {
160161
dominatesPredecessor(bb, df) and
161162
not strictlyDominates(bb, df)
@@ -169,7 +170,7 @@ pragma[noinline]
169170
private predicate inDefDominanceFrontier(BasicBlock bb, SourceVariable v) {
170171
exists(BasicBlock defbb, Definition def |
171172
def.definesAt(v, defbb, _) and
172-
inDominanceFrontier(pragma[only_bind_into](defbb), bb)
173+
inDominanceFrontier(defbb, bb)
173174
)
174175
}
175176

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ private predicate dominatesPredecessor(BasicBlock bb1, BasicBlock bb2) {
156156
}
157157

158158
/** Holds if `df` is in the dominance frontier of `bb`. */
159+
pragma[noinline]
159160
private predicate inDominanceFrontier(BasicBlock bb, BasicBlock df) {
160161
dominatesPredecessor(bb, df) and
161162
not strictlyDominates(bb, df)
@@ -169,7 +170,7 @@ pragma[noinline]
169170
private predicate inDefDominanceFrontier(BasicBlock bb, SourceVariable v) {
170171
exists(BasicBlock defbb, Definition def |
171172
def.definesAt(v, defbb, _) and
172-
inDominanceFrontier(pragma[only_bind_into](defbb), bb)
173+
inDominanceFrontier(defbb, bb)
173174
)
174175
}
175176

0 commit comments

Comments
 (0)