Use SwitchCase.getSelectorExpr

smowton · smowton · commit 06d5233523c3 · 2023-11-30T11:24:03.000Z
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -108,8 +108,7 @@ class Guard extends ExprParent {
    */
   BasicBlock getBasicBlock() {
     result = this.(Expr).getBasicBlock() or
-    result = this.(SwitchCase).getSwitch().getExpr().getBasicBlock() or
-    result = this.(SwitchCase).getSwitchExpr().getExpr().getBasicBlock()
+    result = this.(SwitchCase).getSelectorExpr().getBasicBlock()
   }
 
   /**
diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -445,7 +445,7 @@ private predicate instanceOfGuarded(Expr e, RefType t) {
  */
 private predicate patternCaseGuarded(Expr e, RefType t) {
   exists(PatternCase pc |
-    e = getAProbableAlias([pc.getSwitch().getExpr(), pc.getSwitchExpr().getExpr()]) and
+    e = getAProbableAlias(pc.getSelectorExpr()) and
     guardControls_v1(pc, e.getBasicBlock(), true) and
     t = pc.getPattern().getType()
   )

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,7 @@ class Guard extends ExprParent {`
`108`	`108`	`*/`
`109`	`109`	`BasicBlock getBasicBlock() {`
`110`	`110`	`result = this.(Expr).getBasicBlock() or`
`111`		`- result = this.(SwitchCase).getSwitch().getExpr().getBasicBlock() or`
`112`		`- result = this.(SwitchCase).getSwitchExpr().getExpr().getBasicBlock()`
	`111`	`+ result = this.(SwitchCase).getSelectorExpr().getBasicBlock()`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ private predicate instanceOfGuarded(Expr e, RefType t) {`
`445`	`445`	`*/`
`446`	`446`	`private predicate patternCaseGuarded(Expr e, RefType t) {`
`447`	`447`	`exists(PatternCase pc \|`
`448`		`- e = getAProbableAlias([pc.getSwitch().getExpr(), pc.getSwitchExpr().getExpr()]) and`
	`448`	`+ e = getAProbableAlias(pc.getSelectorExpr()) and`
`449`	`449`	`guardControls_v1(pc, e.getBasicBlock(), true) and`
`450`	`450`	`t = pc.getPattern().getType()`
`451`	`451`	`)`