Don't regard cases with multiple patterns as conducting a type test

smowton · smowton · commit e59487a3248d · 2024-03-25T16:31:36.000Z
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -213,13 +213,13 @@ class Guard extends ExprParent {
       or
       exists(PatternCase pc | this = pc |
         pc.getSelectorExpr() = testedExpr and
-        testedType = pc.getPattern().getType()
+        testedType = pc.getUniquePattern().getType()
       )
     ) and
     (
       if
         exists(RecordPatternExpr rpe |
-          rpe = [this.(InstanceOfExpr).getPattern(), this.(PatternCase).getPattern()]
+          rpe = [this.(InstanceOfExpr).getPattern(), this.(PatternCase).getAPattern()]
         |
           not rpe.isUnrestricted()
         )

Original file line number	Diff line number	Diff line change
`@@ -213,13 +213,13 @@ class Guard extends ExprParent {`
`213`	`213`	`or`
`214`	`214`	`exists(PatternCase pc \| this = pc \|`
`215`	`215`	`pc.getSelectorExpr() = testedExpr and`
`216`		`- testedType = pc.getPattern().getType()`
	`216`	`+ testedType = pc.getUniquePattern().getType()`
`217`	`217`	`)`
`218`	`218`	`) and`
`219`	`219`	`(`
`220`	`220`	`if`
`221`	`221`	`exists(RecordPatternExpr rpe \|`
`222`		`- rpe = [this.(InstanceOfExpr).getPattern(), this.(PatternCase).getPattern()]`
	`222`	`+ rpe = [this.(InstanceOfExpr).getPattern(), this.(PatternCase).getAPattern()]`
`223`	`223`	`\|`
`224`	`224`	`not rpe.isUnrestricted()`
`225`	`225`	`)`