From 9ebabd1e1f49b61f2ca0b222234980842c608910 Mon Sep 17 00:00:00 2001 From: Tom Hvitved Date: Mon, 5 Sep 2022 11:17:30 +0200 Subject: [PATCH] SSA: Strip `shared` from namespace and qlpack name --- cpp/ql/lib/qlpack.yml | 2 +- .../semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll | 2 +- csharp/ql/lib/qlpack.yml | 2 +- csharp/ql/lib/semmle/code/cil/internal/SsaImpl.qll | 2 +- .../semmle/code/csharp/controlflow/internal/PreSsa.qll | 2 +- .../lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll | 2 +- .../lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll | 2 +- ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll | 2 +- ruby/ql/lib/qlpack.yml | 2 +- shared/README.md | 8 ++++---- shared/ssa/codeql/{shared => }/ssa/Ssa.qll | 0 shared/ssa/qlpack.yml | 2 +- swift/ql/lib/codeql/swift/dataflow/Ssa.qll | 2 +- swift/ql/lib/qlpack.yml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) rename shared/ssa/codeql/{shared => }/ssa/Ssa.qll (100%) diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml index 748201565b1..625869c6264 100644 --- a/cpp/ql/lib/qlpack.yml +++ b/cpp/ql/lib/qlpack.yml @@ -6,4 +6,4 @@ extractor: cpp library: true upgrades: upgrades dependencies: - codeql/shared-ssa: 0.0.1-dev + codeql/ssa: 0.0.1 diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll index 9763cedd3c9..2b86e0369bd 100644 --- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll +++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll @@ -4,7 +4,7 @@ private import DataFlowUtil private import DataFlowImplCommon as DataFlowImplCommon private import semmle.code.cpp.models.interfaces.Allocation as Alloc private import semmle.code.cpp.models.interfaces.DataFlow as DataFlow -private import codeql.shared.ssa.Ssa as SsaImplCommon +private import codeql.ssa.Ssa as SsaImplCommon private module SourceVariables { private newtype TSourceVariable = diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml index c45067121f0..94ae9367c6b 100644 --- a/csharp/ql/lib/qlpack.yml +++ b/csharp/ql/lib/qlpack.yml @@ -6,4 +6,4 @@ extractor: csharp library: true upgrades: upgrades dependencies: - codeql/shared-ssa: 0.0.1-dev + codeql/ssa: 0.0.1 diff --git a/csharp/ql/lib/semmle/code/cil/internal/SsaImpl.qll b/csharp/ql/lib/semmle/code/cil/internal/SsaImpl.qll index 70673846caf..9ca724cb08d 100644 --- a/csharp/ql/lib/semmle/code/cil/internal/SsaImpl.qll +++ b/csharp/ql/lib/semmle/code/cil/internal/SsaImpl.qll @@ -1,5 +1,5 @@ private import cil -private import codeql.shared.ssa.Ssa as SsaImplCommon +private import codeql.ssa.Ssa as SsaImplCommon private module SsaInput implements SsaImplCommon::InputSig { class BasicBlock = CIL::BasicBlock; diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll index 2f11301d94c..73d19171a52 100644 --- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll +++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll @@ -9,7 +9,7 @@ module PreSsa { private import AssignableDefinitions private import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl private import semmle.code.csharp.controlflow.internal.PreBasicBlocks as PreBasicBlocks - private import codeql.shared.ssa.Ssa as SsaImplCommon + private import codeql.ssa.Ssa as SsaImplCommon private predicate definitionAt( AssignableDefinition def, SsaInput::BasicBlock bb, int i, SsaInput::SourceVariable v diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll index cd1f3e4e3cb..cb737200a02 100644 --- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll +++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll @@ -5,7 +5,7 @@ import csharp */ module BaseSsa { private import AssignableDefinitions - private import codeql.shared.ssa.Ssa as SsaImplCommon + private import codeql.ssa.Ssa as SsaImplCommon /** * Holds if the `i`th node of basic block `bb` is assignable definition `def`, diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll index 04aa563135b..0655ffee6f9 100644 --- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll +++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll @@ -3,7 +3,7 @@ */ import csharp -private import codeql.shared.ssa.Ssa as SsaImplCommon +private import codeql.ssa.Ssa as SsaImplCommon private import AssignableDefinitions private module SsaInput implements SsaImplCommon::InputSig { diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll index 305e5a9bebb..0e8282f49a2 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll @@ -1,4 +1,4 @@ -private import codeql.shared.ssa.Ssa as SsaImplCommon +private import codeql.ssa.Ssa as SsaImplCommon private import codeql.ruby.AST private import codeql.ruby.CFG as CFG private import codeql.ruby.ast.Variable diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml index 7d9569db2bd..c4b796c737c 100644 --- a/ruby/ql/lib/qlpack.yml +++ b/ruby/ql/lib/qlpack.yml @@ -6,4 +6,4 @@ dbscheme: ruby.dbscheme upgrades: upgrades library: true dependencies: - codeql/shared-ssa: 0.0.1-dev + codeql/ssa: 0.0.1 diff --git a/shared/README.md b/shared/README.md index f132f654383..dc1db929bdb 100644 --- a/shared/README.md +++ b/shared/README.md @@ -4,14 +4,14 @@ This folder contains shared, language-agnostic CodeQL libraries. Libraries are organized into separate query packs, in order to allow for individual versioning. For example, the shared static single assignment (SSA) -library exists in the `codeql/shared-ssa` pack, which can be referenced by adding +library exists in the `codeql/ssa` pack, which can be referenced by adding ``` dependencies: - codeql/shared-ssa: 0.0.1-dev + codeql/ssa: 0.0.1 ``` to `qlpack.yml`. -All shared libraries will belong to a `codeql/shared-` pack, and live in the -namespace `codeql.shared.`. \ No newline at end of file +All shared libraries will belong to a `codeql/` pack, and live in the +namespace `codeql.`. \ No newline at end of file diff --git a/shared/ssa/codeql/shared/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll similarity index 100% rename from shared/ssa/codeql/shared/ssa/Ssa.qll rename to shared/ssa/codeql/ssa/Ssa.qll diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml index 4a7e8777299..d62242816da 100644 --- a/shared/ssa/qlpack.yml +++ b/shared/ssa/qlpack.yml @@ -1,4 +1,4 @@ -name: codeql/shared-ssa +name: codeql/ssa version: 0.0.1-dev groups: shared library: true diff --git a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll index 11520821708..92120e9880e 100644 --- a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll +++ b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll @@ -1,7 +1,7 @@ cached module Ssa { private import swift - private import codeql.shared.ssa.Ssa as SsaImplCommon + private import codeql.ssa.Ssa as SsaImplCommon private import codeql.swift.controlflow.CfgNodes private import codeql.swift.controlflow.ControlFlowGraph private import codeql.swift.controlflow.BasicBlocks as BasicBlocks diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml index 5e86621dea4..214418df53e 100644 --- a/swift/ql/lib/qlpack.yml +++ b/swift/ql/lib/qlpack.yml @@ -6,4 +6,4 @@ dbscheme: swift.dbscheme upgrades: upgrades library: true dependencies: - codeql/shared-ssa: 0.0.1-dev + codeql/ssa: 0.0.1