Adapt ancillary analyses to record patterns

smowton · smowton · commit 936c0206ea48 · 2023-11-30T11:23:59.000Z
diff --git a/java/ql/lib/semmle/code/java/Dependency.qll b/java/ql/lib/semmle/code/java/Dependency.qll
@@ -80,9 +80,9 @@ predicate depends(RefType t, RefType dep) {
       usesType(ioe.getCheckedType(), dep)
     )
     or
-    // the type accessed in a pattern-switch case statement in `t`.
+    // A type accessed in a pattern-switch case statement in `t`.
     exists(PatternCase pc | t = pc.getEnclosingCallable().getDeclaringType() |
-      usesType(pc.getPattern().getType(), dep)
+      usesType(pc.getPattern().getAChildExpr*().getType(), dep)
     )
   )
 }
diff --git a/java/ql/lib/semmle/code/java/DependencyCounts.qll b/java/ql/lib/semmle/code/java/DependencyCounts.qll
@@ -105,7 +105,7 @@ predicate numDepends(RefType t, RefType dep, int value) {
       or
       // the type accessed in a pattern-switch case statement in `t`.
       exists(PatternCase pc | elem = pc and t = pc.getEnclosingCallable().getDeclaringType() |
-        usesType(pc.getDecl().getType(), dep)
+        usesType(pc.getPattern().getAChildExpr*().getType(), dep)
       )
     )
 }
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -180,7 +180,7 @@ private predicate switchCaseControls(SwitchCase sc, BasicBlock bb) {
     selector = sc.getSelectorExpr() and
     (
       if sc instanceof PatternCase
-      then caseblock.getFirstNode() = sc.(PatternCase).getPattern().getControlFlowNode()
+      then caseblock.getANode() = sc.(PatternCase).getPattern().getControlFlowNode()
       else (
         caseblock.getFirstNode() = sc.getControlFlowNode() and
         // Check there is no fall-through edge from a previous case:
diff --git a/java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll b/java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll
@@ -82,7 +82,7 @@ private predicate step(Node n1, Node n2) {
     )
     or
     exists(PatternCase pc |
-      pc.getPattern() = def.(BaseSsaUpdate).getDefiningExpr() and
+      pc.getPattern().asBindingPattern() = def.(BaseSsaUpdate).getDefiningExpr() and
       (
         pc.getSwitch().getExpr() = n1.asExpr()
         or

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ predicate depends(RefType t, RefType dep) {`
`80`	`80`	`usesType(ioe.getCheckedType(), dep)`
`81`	`81`	`)`
`82`	`82`	`or`
`83`		- // the type accessed in a pattern-switch case statement in `t`.
	`83`	+ // A type accessed in a pattern-switch case statement in `t`.
`84`	`84`	`exists(PatternCase pc \| t = pc.getEnclosingCallable().getDeclaringType() \|`
`85`		`- usesType(pc.getPattern().getType(), dep)`
	`85`	`+ usesType(pc.getPattern().getAChildExpr*().getType(), dep)`
`86`	`86`	`)`
`87`	`87`	`)`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ predicate numDepends(RefType t, RefType dep, int value) {`
`105`	`105`	`or`
`106`	`106`	// the type accessed in a pattern-switch case statement in `t`.
`107`	`107`	`exists(PatternCase pc \| elem = pc and t = pc.getEnclosingCallable().getDeclaringType() \|`
`108`		`- usesType(pc.getDecl().getType(), dep)`
	`108`	`+ usesType(pc.getPattern().getAChildExpr*().getType(), dep)`
`109`	`109`	`)`
`110`	`110`	`)`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ private predicate switchCaseControls(SwitchCase sc, BasicBlock bb) {`
`180`	`180`	`selector = sc.getSelectorExpr() and`
`181`	`181`	`(`
`182`	`182`	`if sc instanceof PatternCase`
`183`		`- then caseblock.getFirstNode() = sc.(PatternCase).getPattern().getControlFlowNode()`
	`183`	`+ then caseblock.getANode() = sc.(PatternCase).getPattern().getControlFlowNode()`
`184`	`184`	`else (`
`185`	`185`	`caseblock.getFirstNode() = sc.getControlFlowNode() and`
`186`	`186`	`// Check there is no fall-through edge from a previous case:`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private predicate step(Node n1, Node n2) {`
`82`	`82`	`)`
`83`	`83`	`or`
`84`	`84`	`exists(PatternCase pc \|`
`85`		`- pc.getPattern() = def.(BaseSsaUpdate).getDefiningExpr() and`
	`85`	`+ pc.getPattern().asBindingPattern() = def.(BaseSsaUpdate).getDefiningExpr() and`
`86`	`86`	`(`
`87`	`87`	`pc.getSwitch().getExpr() = n1.asExpr()`
`88`	`88`	`or`