Use specific codeql/shared-ssa pack for the SSA library

hvitved · hvitved · commit 6b728acd9e9a · 2022-09-01T21:23:33.000+02:00
diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml
@@ -95,7 +95,7 @@ jobs:
         uses: ./.github/actions/fetch-codeql
       - name: Build Query Pack
         run: |
-          codeql pack create ../shared/ql/lib --output target/packs
+          codeql pack create ../shared/ssa --output target/packs
           codeql pack create ql/lib --output target/packs
           codeql pack install ql/src
           codeql pack create ql/src --output target/packs
diff --git a/codeql-workspace.yml b/codeql-workspace.yml
@@ -4,6 +4,7 @@ provide:
   - "*/ql/test/qlpack.yml"
   - "*/ql/examples/qlpack.yml"
   - "*/ql/consistency-queries/qlpack.yml"
+  - "shared/*/qlpack.yml"
   - "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
   - "go/ql/config/legacy-support/qlpack.yml"
   - "go/build/codeql-extractor-go/codeql-extractor.yml"
diff --git 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-all: "*"
+  codeql/shared-ssa: "*"
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
@@ -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.dataflow.Ssa as SsaImplCommon
+private import codeql.shared.ssa.Ssa as SsaImplCommon
 
 private module SourceVariables {
   private newtype TSourceVariable =
diff --git 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-all: "*"
+  codeql/shared-ssa: "*" 
diff --git 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.dataflow.Ssa as SsaImplCommon
+private import codeql.shared.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
@@ -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.dataflow.Ssa as SsaImplCommon
+  private import codeql.shared.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
@@ -5,7 +5,7 @@ import csharp
  */
 module BaseSsa {
   private import AssignableDefinitions
-  private import codeql.shared.dataflow.Ssa as SsaImplCommon
+  private import codeql.shared.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
@@ -3,7 +3,7 @@
  */
 
 import csharp
-private import codeql.shared.dataflow.Ssa as SsaImplCommon
+private import codeql.shared.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
@@ -1,4 +1,4 @@
-private import codeql.shared.dataflow.Ssa as SsaImplCommon
+private import codeql.shared.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
@@ -6,4 +6,4 @@ dbscheme: ruby.dbscheme
 upgrades: upgrades
 library: true
 dependencies:
-  codeql/shared-all: "*"
+  codeql/shared-ssa: "*"
diff --git a/shared/README.md b/shared/README.md
@@ -2,11 +2,16 @@
 
 This folder contains shared, language-agnostic CodeQL libraries.
 
-They can be used by adding
+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
 
 ```
 dependencies:
-  codeql/shared-all: "*"
+  codeql/shared-ssa: "*"
 ```
 
-to `qlpack.yml`, and the libraries all belong to the `codeql.shared` namespace.
+to `qlpack.yml`.
+
+All shared libraries will belong to a `codeql/shared-<name>` pack, and live in the
+namespace `codeql.shared.<name>`.
diff --git a/shared/ssa/codeql/shared/ssa/Ssa.qll b/shared/ssa/codeql/shared/ssa/Ssa.qll
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
@@ -1,4 +1,4 @@
-name: codeql/shared-all
+name: codeql/shared-ssa
 version: 0.0.1
 groups: shared
 library: true
diff --git 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.dataflow.Ssa as SsaImplCommon
+  private import codeql.shared.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
@@ -6,4 +6,4 @@ dbscheme: swift.dbscheme
 upgrades: upgrades
 library: true
 dependencies:
-  codeql/shared-all: "*"
+  codeql/shared-ssa: "*"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-private import codeql.shared.dataflow.Ssa as SsaImplCommon`
	`1`	`+private import codeql.shared.ssa.Ssa as SsaImplCommon`
`2`	`2`	`private import codeql.ruby.AST`
`3`	`3`	`private import codeql.ruby.CFG as CFG`
`4`	`4`	`private import codeql.ruby.ast.Variable`