From 28cb37364c6bbe9541ad88653405b603d744c727 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Fri, 14 Feb 2025 14:16:21 +0100 Subject: [PATCH 1/2] Rust: delete dead code. --- .../codeql/rust/dataflow/internal/SsaImpl.qll | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll index 009efed92feb..b1db4497b893 100644 --- a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll +++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll @@ -128,14 +128,6 @@ private predicate adjacentDefRead( v = def.getSourceVariable() } -pragma[noinline] -private predicate adjacentDefReadExt( - DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v -) { - Impl::adjacentDefReadExt(def, _, bb1, i1, bb2, i2) and - v = def.getSourceVariable() -} - /** Holds if `v` is read at index `i` in basic block `bb`. */ private predicate variableReadActual(BasicBlock bb, int i, Variable v) { exists(VariableAccess read | @@ -191,22 +183,6 @@ private predicate adjacentDefReachesRead( ) } -private predicate adjacentDefReachesReadExt( - DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2 -) { - exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) | - def.definesAt(v, bb1, i1, _) - or - SsaInput::variableRead(bb1, i1, v, true) - ) - or - exists(BasicBlock bb3, int i3 | - adjacentDefReachesReadExt(def, bb1, i1, bb3, i3) and - SsaInput::variableRead(bb3, i3, _, false) and - Impl::adjacentDefReadExt(def, _, bb3, i3, bb2, i2) - ) -} - /** Same as `adjacentDefRead`, but skips uncertain reads. */ pragma[nomagic] private predicate adjacentDefSkipUncertainReads( From c84087cd192447e55f0b5d062bde85cfc09ab255 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Fri, 14 Feb 2025 14:18:20 +0100 Subject: [PATCH 2/2] Ruby: Deprecate dependencies of deprecated predicates for clarity. --- ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll index eb793cbd147d..7185f0389aaa 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll @@ -232,7 +232,7 @@ private predicate adjacentDefRead( } pragma[noinline] -private predicate adjacentDefReadExt( +deprecated private predicate adjacentDefReadExt( DefinitionExt def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2, SsaInput::SourceVariable v ) { @@ -256,7 +256,7 @@ private predicate adjacentDefReachesRead( ) } -private predicate adjacentDefReachesReadExt( +deprecated private predicate adjacentDefReachesReadExt( DefinitionExt def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 ) { exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) | @@ -281,7 +281,7 @@ private predicate adjacentDefSkipUncertainReads( SsaInput::variableRead(bb2, i2, _, true) } -private predicate adjacentDefReachesUncertainReadExt( +deprecated private predicate adjacentDefReachesUncertainReadExt( DefinitionExt def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 ) { adjacentDefReachesReadExt(def, bb1, i1, bb2, i2) and