Merge branch 'main' of https://github.com/github/codeql into oscarsj/mergeback-rc-3-20-into-main

python/ql/src/Classes/ClassAttributes.qll

@@ -1,5 +1,5 @@
 import python
-private import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 /** A helper class for UndefinedClassAttribute.ql and MaybeUndefinedClassAttribute.ql */
 class CheckClass extends ClassObject {

python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate does_nothing(PyFunctionObject f) {
   not exists(Stmt s | s.getScope() = f.getFunction() |

python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql

@@ -13,6 +13,7 @@
 
 import python
 import Equality
+private import LegacyPointsTo
 
 predicate class_stores_to_attribute(ClassValue cls, SelfAttributeStore store, string name) {
   exists(FunctionValue f |

python/ql/src/Classes/InconsistentMRO.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 ClassObject left_base(ClassObject type, ClassObject base) {
   exists(int i | i > 0 and type.getBaseType(i) = base and result = type.getBaseType(i - 1))

python/ql/src/Classes/MaybeUndefinedClassAttribute.ql

@@ -12,6 +12,7 @@
 
 import python
 import ClassAttributes
+private import LegacyPointsTo
 
 predicate guarded_by_other_attribute(SelfAttributeRead a, CheckClass c) {
   c.sometimesDefines(a.getName()) and

python/ql/src/Classes/MutatingDescriptor.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate mutates_descriptor(ClassObject cls, SelfAttributeStore s) {
   cls.isDescriptorType() and

python/ql/src/Classes/OverwritingAttributeInSuperClass.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 class InitCallStmt extends ExprStmt {
   InitCallStmt() {

python/ql/src/Classes/PropertyInOldStyleClass.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from PropertyObject prop, ClassObject cls
 where cls.declaredAttribute(_) = prop and not cls.failedInference() and not cls.isNewStyle()

python/ql/src/Classes/ShouldBeContextManager.ql

@@ -14,6 +14,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassValue c
 where not c.isBuiltin() and not c.isContextManager() and exists(c.declaredAttribute("__del__"))

python/ql/src/Classes/SlotsInOldStyleClass.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject c
 where not c.isNewStyle() and c.declaresAttribute("__slots__") and not c.failedInference()

python/ql/src/Classes/SuperInOldStyleClass.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate uses_of_super_in_old_style_class(Call s) {
   exists(Function f, ClassObject c |

python/ql/src/Classes/UndefinedClassAttribute.ql

@@ -12,6 +12,7 @@
 
 import python
 import ClassAttributes
+private import LegacyPointsTo
 
 predicate undefined_class_attribute(SelfAttributeRead a, CheckClass c, int line, string name) {
   name = a.getName() and

python/ql/src/Classes/UselessClass.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate fewer_than_two_public_methods(Class cls, int methods) {
   (methods = 0 or methods = 1) and

python/ql/src/Classes/WrongNameForArgumentInClassInstantiation.ql

@@ -16,6 +16,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, ClassValue cls, string name, FunctionValue init
 where

python/ql/src/Classes/WrongNumberArgumentsInClassInstantiation.ql

@@ -15,6 +15,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, ClassValue cls, string too, string should, int limit, FunctionValue init
 where

python/ql/src/Exceptions/IllegalExceptionHandlerType.ql

@@ -12,8 +12,9 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from ExceptFlowNode ex, Value t, ClassValue c, ControlFlowNode origin, string what
+from ExceptFlowNodeWithPointsTo ex, Value t, ClassValue c, ControlFlowNode origin, string what
 where
   ex.handledException(t, c, origin) and
   (

python/ql/src/Exceptions/IllegalRaise.ql

@@ -14,6 +14,7 @@
 import python
 import Raising
 import Exceptions.NotImplemented
+private import LegacyPointsTo
 
 from Raise r, ClassValue t
 where

python/ql/src/Expressions/ContainsNonContainer.ql

@@ -13,7 +13,6 @@
 
 import python
 private import LegacyPointsTo
-import semmle.python.pointsto.PointsTo
 
 predicate rhs_in_expr(ControlFlowNode rhs, Compare cmp) {
   exists(Cmpop op, int i | cmp.getOp(i) = op and cmp.getComparator(i) = rhs.getNode() |

python/ql/src/Expressions/IsComparisons.qll

@@ -2,7 +2,6 @@
 
 import python
 private import LegacyPointsTo
-private import semmle.python.objects.ObjectInternal
 
 /** Holds if the comparison `comp` uses `is` or `is not` (represented as `op`) to compare its `left` and `right` arguments. */
 predicate comparison_using_is(Compare comp, ControlFlowNode left, Cmpop op, ControlFlowNode right) {

python/ql/src/Expressions/NonPortableComparisonUsingIs.ql

@@ -13,6 +13,7 @@
 
 import python
 import IsComparisons
+private import LegacyPointsTo
 
 from Compare comp, Cmpop op, ClassValue c
 where

python/ql/src/Expressions/RedundantComparison.qll

@@ -1,6 +1,7 @@
 /** Helper functions for queries that test redundant comparisons. */
 
 import python
+private import LegacyPointsTo
 
 /** A comparison where the left and right hand sides appear to be identical. */
 class RedundantComparison extends Compare {

python/ql/src/Expressions/WrongNameForArgumentInCall.ql

@@ -16,6 +16,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, FunctionObject func, string name
 where

python/ql/src/Expressions/WrongNumberArgumentsForFormat.ql

@@ -15,7 +15,6 @@
 
 import python
 import LegacyPointsTo
-import semmle.python.objects.ObjectInternal
 import semmle.python.strings
 
 predicate string_format(BinaryExpr operation, StringLiteral str, Value args, AstNode origin) {

python/ql/src/Expressions/WrongNumberArgumentsInCall.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import CallArgs
 
 from Call call, FunctionValue func, string too, string should, int limit

python/ql/src/Functions/ConsistentReturns.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate explicitly_returns_non_none(Function func) {
   exists(Return return |
@@ -21,7 +22,7 @@ predicate explicitly_returns_non_none(Function func) {
 }
 
 predicate has_implicit_return(Function func) {
-  exists(ControlFlowNode fallthru |
+  exists(ControlFlowNodeWithPointsTo fallthru |
     fallthru = func.getFallthroughNode() and not fallthru.unlikelyReachable()
   )
   or

python/ql/src/Functions/DeprecatedSliceMethod.ql

@@ -10,6 +10,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate slice_method_name(string name) {
   name = "__getslice__" or name = "__setslice__" or name = "__delslice__"

python/ql/src/Functions/IncorrectlyOverriddenMethod.ql

@@ -14,6 +14,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, FunctionValue func, FunctionValue overridden, string problem
 where

python/ql/src/Functions/IncorrectlySpecifiedOverriddenMethod.ql

@@ -14,6 +14,7 @@
 
 import python
 import Expressions.CallArgs
+private import LegacyPointsTo
 
 from Call call, FunctionValue func, FunctionValue overriding, string problem
 where

python/ql/src/Functions/IterReturnsNonIterator.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassValue iterable, FunctionValue iter, ClassValue iterator
 where

python/ql/src/Functions/OverlyComplexDelMethod.ql

@@ -12,11 +12,12 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionValue method
 where
   exists(ClassValue c |
     c.declaredAttribute("__del__") = method and
-    method.getScope().getMetrics().getCyclomaticComplexity() > 3
+    method.getScope().(FunctionMetrics).getCyclomaticComplexity() > 3
   )
 select method, "Overly complex '__del__' method."

python/ql/src/Functions/ReturnValueIgnored.ql

@@ -14,7 +14,7 @@
  */
 
 import python
-import semmle.python.objects.Callables
+private import LegacyPointsTo
 
 predicate meaningful_return_value(Expr val) {
   val instanceof Name

python/ql/src/Imports/Cyclic.qll

@@ -1,5 +1,6 @@
 import python
 private import LegacyPointsTo
+private import semmle.python.types.ImportTime
 
 predicate is_import_time(Stmt s) { not s.getScope+() instanceof Function }
 

python/ql/src/Imports/CyclicImport.ql

@@ -13,6 +13,7 @@
 
 import python
 import Cyclic
+private import LegacyPointsTo
 
 from ModuleValue m1, ModuleValue m2, Stmt imp
 where

python/ql/src/Imports/ModuleImportsItself.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate modules_imports_itself(ImportingStmt i, ModuleValue m) {
   i.getEnclosingModule() = m.getScope() and

python/ql/src/Imports/ModuleLevelCyclicImport.ql

@@ -14,6 +14,7 @@
 
 import python
 import Cyclic
+private import LegacyPointsTo
 
 // This is a potentially crashing bug if
 // 1. the imports in the whole cycle are lexically outside a def (and so executed at import time)

python/ql/src/Imports/UnintentionalImport.ql

@@ -13,6 +13,8 @@
  */
 
 import python
+private import LegacyPointsTo
+private import semmle.python.types.ImportTime
 
 predicate import_star(ImportStar imp, ModuleValue exporter) {
   exporter.importedAs(imp.getImportedModuleName())

python/ql/src/Metrics/CLinesOfCode.ql

@@ -10,6 +10,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Function f
-select f, f.getMetrics().getNumberOfLinesOfCode() as n order by n desc
+from FunctionMetrics f
+select f, f.getNumberOfLinesOfCode() as n order by n desc

python/ql/src/Metrics/ClassAfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getAfferentCoupling() as n order by n desc

python/ql/src/Metrics/ClassEfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getEfferentCoupling() as n order by n desc

python/ql/src/Metrics/CommentRatio.ql

@@ -12,8 +12,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, ModuleMetrics mm
-where mm = m.getMetrics() and mm.getNumberOfLines() > 0
-select m, 100.0 * (mm.getNumberOfLinesOfComments().(float) / mm.getNumberOfLines().(float)) as ratio
+from ModuleMetrics mm
+where mm.getNumberOfLines() > 0
+select mm,
+  100.0 * (mm.getNumberOfLinesOfComments().(float) / mm.getNumberOfLines().(float)) as ratio
   order by ratio desc

python/ql/src/Metrics/CyclomaticComplexity.ql

@@ -13,7 +13,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Function func, int complexity
-where complexity = func.getMetrics().getCyclomaticComplexity()
+from FunctionMetrics func, int complexity
+where complexity = func.getCyclomaticComplexity()
 select func, complexity order by complexity desc

python/ql/src/Metrics/Dependencies/ExternalDependenciesSourceLinks.ql

@@ -8,6 +8,7 @@
 
 import python
 import semmle.python.dependencies.TechInventory
+private import LegacyPointsTo
 
 /*
  * This query creates the source links for the ExternalDependencies.ql query.

python/ql/src/Metrics/DirectImports.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleValue m, int n
 where n = count(ModuleValue imp | imp = m.getAnImportedModule())

python/ql/src/Metrics/DocStringRatio.ql

@@ -11,9 +11,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, ModuleMetrics mm
-where mm = m.getMetrics() and mm.getNumberOfLines() > 0
-select m,
+from ModuleMetrics mm
+where mm.getNumberOfLines() > 0
+select mm,
   100.0 * (mm.getNumberOfLinesOfDocStrings().(float) / mm.getNumberOfLines().(float)) as ratio
   order by ratio desc

python/ql/src/Metrics/FLines.ql

@@ -9,7 +9,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, int n
-where n = m.getMetrics().getNumberOfLines()
+from ModuleMetrics m, int n
+where n = m.getNumberOfLines()
 select m, n order by n desc

python/ql/src/Metrics/FLinesOfCode.ql

@@ -11,7 +11,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, int n
-where n = m.getMetrics().getNumberOfLinesOfCode()
+from ModuleMetrics m, int n
+where n = m.getNumberOfLinesOfCode()
 select m, n order by n desc

python/ql/src/Metrics/FLinesOfComments.ql

@@ -10,8 +10,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, int n
-where
-  n = m.getMetrics().getNumberOfLinesOfComments() + m.getMetrics().getNumberOfLinesOfDocStrings()
+from ModuleMetrics m, int n
+where n = m.getNumberOfLinesOfComments() + m.getNumberOfLinesOfDocStrings()
 select m, n order by n desc

python/ql/src/Metrics/FunctionNumberOfCalls.ql

@@ -9,6 +9,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getNumberOfCalls() as n order by n desc

python/ql/src/Metrics/FunctionStatementNestingDepth.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getStatementNestingDepth() as n order by n desc

python/ql/src/Metrics/History/HChurn.ql

@@ -10,8 +10,9 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
 where
   n =
     sum(Commit entry, int churn |
@@ -19,5 +20,5 @@ where
     |
       churn
     ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, n order by n desc

python/ql/src/Metrics/History/HLinesAdded.ql

@@ -10,8 +10,9 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
 where
   n =
     sum(Commit entry, int churn |
@@ -19,5 +20,5 @@ where
     |
       churn
     ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, n order by n desc

python/ql/src/Metrics/History/HLinesDeleted.ql

@@ -10,8 +10,9 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
 where
   n =
     sum(Commit entry, int churn |
@@ -19,5 +20,5 @@ where
     |
       churn
     ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, n order by n desc

python/ql/src/Metrics/History/HNumberOfAuthors.ql

@@ -10,7 +10,8 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+from ModuleMetrics m
+where exists(m.getNumberOfLinesOfCode())
 select m, count(Author author | author.getAnEditedFile() = m.getFile())

python/ql/src/Metrics/History/HNumberOfCoCommits.ql

@@ -10,11 +10,12 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
 int committedFiles(Commit commit) { result = count(commit.getAnAffectedFile()) }
 
-from Module m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+from ModuleMetrics m
+where exists(m.getNumberOfLinesOfCode())
 select m,
   avg(Commit commit, int toAvg |
     commit.getAnAffectedFile() = m.getFile() and toAvg = committedFiles(commit) - 1

python/ql/src/Metrics/History/HNumberOfReCommits.ql

@@ -10,6 +10,7 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
 predicate inRange(Commit first, Commit second) {
   first.getAnAffectedFile() = second.getAnAffectedFile() and
@@ -29,6 +30,6 @@ int recommitsForFile(File f) {
     )
 }
 
-from Module m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+from ModuleMetrics m
+where exists(m.getNumberOfLinesOfCode())
 select m, recommitsForFile(m.getFile())

python/ql/src/Metrics/History/HNumberOfRecentAuthors.ql

@@ -10,9 +10,10 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+from ModuleMetrics m
+where exists(m.getNumberOfLinesOfCode())
 select m,
   count(Author author |
     exists(Commit e |

python/ql/src/Metrics/History/HNumberOfRecentChangedFiles.ql

@@ -10,11 +10,12 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m
+from ModuleMetrics m
 where
   exists(Commit e |
     e.getAnAffectedFile() = m.getFile() and e.daysToNow() <= 180 and not artificialChange(e)
   ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, 1

python/ql/src/Metrics/LackofCohesionInMethodsCK.ql

@@ -9,6 +9,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getLackOfCohesionCK() as n order by n desc

python/ql/src/Metrics/LackofCohesionInMethodsHM.ql

@@ -9,6 +9,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getLackOfCohesionHM() as n order by n desc

python/ql/src/Metrics/ModuleAfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleMetrics m
 select m, m.getAfferentCoupling() as n order by n desc

python/ql/src/Metrics/ModuleEfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleMetrics m
 select m, m.getEfferentCoupling() as n order by n desc

python/ql/src/Metrics/NumberOfParametersWithoutDefault.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getNumberOfParametersWithoutDefault() as n order by n desc

python/ql/src/Metrics/TransitiveImports.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleValue m, int n
 where n = count(ModuleValue imp | imp = m.getAnImportedModule+() and imp != m)

python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll

@@ -182,7 +182,7 @@ module UntrustedDataToExternalApiFlow = TaintTracking::Global<UntrustedDataToExt
 
 /** A node representing untrusted data being passed to an external API. */
 class UntrustedExternalApiDataNode extends ExternalApiDataNode {
-  UntrustedExternalApiDataNode() { UntrustedDataToExternalApiFlow::flow(_, this) }
+  UntrustedExternalApiDataNode() { UntrustedDataToExternalApiFlow::flowTo(this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() { UntrustedDataToExternalApiFlow::flow(result, this) }

python/ql/src/Statements/DocStrings.ql

@@ -17,6 +17,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate needs_docstring(Scope s) {
   s.isPublic() and
@@ -27,12 +28,12 @@ predicate needs_docstring(Scope s) {
   )
 }
 
-predicate function_needs_docstring(Function f) {
+predicate function_needs_docstring(FunctionMetrics f) {
   not exists(FunctionValue fo, FunctionValue base | fo.overrides(base) and fo.getScope() = f |
     not function_needs_docstring(base.getScope())
   ) and
   f.getName() != "lambda" and
-  (f.getMetrics().getNumberOfLinesOfCode() - count(f.getADecorator())) > 2 and
+  (f.getNumberOfLinesOfCode() - count(f.getADecorator())) > 2 and
   not exists(PythonPropertyObject p |
     p.getGetter().getFunction() = f or
     p.getSetter().getFunction() = f

python/ql/src/Statements/RedundantAssignment.ql

@@ -36,7 +36,7 @@ predicate same_value(Expr left, Expr right) {
 }
 
 predicate maybe_defined_in_outer_scope(Name n) {
-  exists(SsaVariable v | v.getAUse().getNode() = n | v.maybeUndefined())
+  exists(SsaVariableWithPointsTo v | v.getAUse().getNode() = n | v.maybeUndefined())
 }
 
 /*

python/ql/src/Statements/SideEffectInAssert.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate func_with_side_effects(Expr e) {
   exists(string name | name = e.(Attribute).getName() or name = e.(Name).getId() |

python/ql/src/Statements/TopLevelPrint.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate main_eq_name(If i) {
   exists(Name n, StringLiteral m, Compare c |

python/ql/src/Statements/UnnecessaryDelete.ql

@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate isInsideLoop(AstNode node) {
   node.getParentNode() instanceof While

python/ql/src/Summary/LinesOfCode.ql

@@ -10,5 +10,6 @@
  */
 
 import python
+private import LegacyPointsTo
 
-select sum(Module m | | m.getMetrics().getNumberOfLinesOfCode())
+select sum(ModuleMetrics m | | m.getNumberOfLinesOfCode())

python/ql/src/Summary/LinesOfUserCode.ql

@@ -14,10 +14,11 @@
 
 import python
 import semmle.python.filters.GeneratedCode
+private import LegacyPointsTo
 
-select sum(Module m |
+select sum(ModuleMetrics m |
     exists(m.getFile().getRelativePath()) and
     not m.getFile() instanceof GeneratedFile
   |
-    m.getMetrics().getNumberOfLinesOfCode()
+    m.getNumberOfLinesOfCode()
   )

python/ql/src/Variables/Undefined.qll

@@ -1,6 +1,7 @@
 import python
 import Loop
 import semmle.python.dataflow.TaintTracking
+private import LegacyPointsTo
 
 /** A marker for "uninitialized". */
 class Uninitialized extends TaintKind {

python/ql/src/Variables/UndefinedGlobal.ql

@@ -12,9 +12,9 @@
 
 import python
 private import LegacyPointsTo
+private import semmle.python.types.ImportTime
 import Variables.MonkeyPatched
 import Loop
-import semmle.python.pointsto.PointsTo
 
 predicate guarded_against_name_error(Name u) {
   exists(Try t | t.getBody().getAnItem().contains(u) |
@@ -62,7 +62,7 @@ predicate undefined_use_in_function(Name u) {
   not u.getEnclosingModule().(ImportTimeScope).definesName(u.getId()) and
   not exists(ModuleValue m | m.getScope() = u.getEnclosingModule() | m.hasAttribute(u.getId())) and
   not globallyDefinedName(u.getId()) and
-  not exists(SsaVariable var | var.getAUse().getNode() = u and not var.maybeUndefined()) and
+  not exists(SsaVariableWithPointsTo var | var.getAUse().getNode() = u and not var.maybeUndefined()) and
   not guarded_against_name_error(u) and
   not (u.getEnclosingModule().isPackageInit() and u.getId() = "__path__")
 }
@@ -70,7 +70,7 @@ predicate undefined_use_in_function(Name u) {
 predicate undefined_use_in_class_or_module(Name u) {
   exists(GlobalVariable v | u.uses(v)) and
   not u.getScope().getScope*() instanceof Function and
-  exists(SsaVariable var | var.getAUse().getNode() = u | var.maybeUndefined()) and
+  exists(SsaVariableWithPointsTo var | var.getAUse().getNode() = u | var.maybeUndefined()) and
   not guarded_against_name_error(u) and
   not exists(ModuleValue m | m.getScope() = u.getEnclosingModule() | m.hasAttribute(u.getId())) and
   not (u.getEnclosingModule().isPackageInit() and u.getId() = "__path__") and

python/ql/src/Variables/UndefinedPlaceHolder.ql

@@ -13,10 +13,14 @@
 
 import python
 import Variables.MonkeyPatched
+private import LegacyPointsTo
+private import semmle.python.types.ImportTime
 
 /* Local variable part */
 predicate initialized_as_local(PlaceHolder use) {
-  exists(SsaVariable l, Function f | f = use.getScope() and l.getAUse() = use.getAFlowNode() |
+  exists(SsaVariableWithPointsTo l, Function f |
+    f = use.getScope() and l.getAUse() = use.getAFlowNode()
+  |
     l.getVariable() instanceof LocalVariable and
     not l.maybeUndefined()
   )

python/ql/src/Variables/UninitializedLocal.ql

@@ -14,7 +14,6 @@
 import python
 private import LegacyPointsTo
 import Undefined
-import semmle.python.pointsto.PointsTo
 
 predicate uninitialized_local(NameNode use) {
   exists(FastLocalVariable local | use.uses(local) or use.deletes(local) |

python/ql/src/Variables/UnusedParameter.ql

@@ -14,6 +14,7 @@
 
 import python
 import Definition
+private import LegacyPointsTo
 
 predicate unused_parameter(FunctionValue f, LocalVariable v) {
   v.isParameter() and

python/ql/src/analysis/CallGraphEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 
 from int total_facts, int total_size, int depth, float efficiency
 where

python/ql/src/analysis/CallGraphMarginalEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 
 from int total_facts, int total_size, int depth, float efficiency
 where

python/ql/src/analysis/ContextEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 
 from int total_facts, int total_size, int depth, float efficiency
 where

python/ql/src/analysis/ContextMarginalEfficiency.ql

@@ -4,8 +4,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 
 int depth(ControlFlowNode f, Object value, ClassObject cls) {
   exists(PointsToContext ctx |

python/ql/src/analysis/CrossProjectDefinitions.qll

@@ -3,7 +3,7 @@
  */
 
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 private newtype TSymbol =
   TModule(Module m) or

python/ql/src/analysis/Efficiency.ql

@@ -5,8 +5,6 @@
 
 import python
 private import LegacyPointsTo
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
 
 predicate trivial(ControlFlowNode f) {
   f.getNode() instanceof Parameter

python/ql/src/analysis/FailedInference.ql

@@ -1,5 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
+private import LegacyPointsTo
 
 from ClassValue cls, string reason
 where Types::failedInference(cls, reason)

python/ql/src/analysis/Summary.ql

@@ -3,6 +3,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from string key, string value
 where

python/ql/src/analysis/TypeHierarchyFailure.ql

@@ -8,6 +8,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from Class cls, string reason
 where exists(ClassObject c | c.getPyClass() = cls | c.failedInference(reason))

python/ql/src/meta/alerts/RemoteFlowSourcesReach.ql

@@ -38,5 +38,5 @@ module RemoteFlowSourceReachConfig implements DataFlow::ConfigSig {
 module RemoteFlowSourceReachFlow = TaintTracking::Global<RemoteFlowSourceReachConfig>;
 
 from DataFlow::Node reachable
-where RemoteFlowSourceReachFlow::flow(_, reachable)
+where RemoteFlowSourceReachFlow::flowTo(reachable)
 select reachable, prettyNode(reachable)

python/ql/src/meta/analysis-quality/CallGraphQuality.qll

@@ -5,6 +5,7 @@
 
 import python
 import meta.MetaMetrics
+private import LegacyPointsTo
 
 newtype TTarget =
   TFunction(Function func) or

python/ql/src/meta/debug/DebugStats.ql

@@ -1,15 +1,15 @@
 import python
+private import LegacyPointsTo
 
 from string msg, int cnt, int sort
 where
   sort = 0 and
   msg = "Lines of code in DB" and
-  cnt = sum(Module m | | m.getMetrics().getNumberOfLinesOfCode())
+  cnt = sum(ModuleMetrics m | | m.getNumberOfLinesOfCode())
   or
   sort = 1 and
   msg = "Lines of code in repo" and
-  cnt =
-    sum(Module m | exists(m.getFile().getRelativePath()) | m.getMetrics().getNumberOfLinesOfCode())
+  cnt = sum(ModuleMetrics m | exists(m.getFile().getRelativePath()) | m.getNumberOfLinesOfCode())
   or
   sort = 2 and
   msg = "Files" and