@@ -318,7 +318,7 @@ module AssignableInternal {
       TLocalVariableDefinition(LocalVariableDeclExpr lvde) {
         not lvde.hasInitializer() and
         not exists(getTupleSource(TTupleAssignmentDefinition(_, lvde))) and
-        not lvde instanceof TopLevelPatternDecl and
+        not lvde instanceof LocalVariablePatternDecl and
         not lvde.isOutArgument()
       } or
       TImplicitParameterDefinition(Parameter p) {
@@ -337,7 +337,7 @@ module AssignableInternal {
         default = p.getDefaultValue()
       } or
       TAddressOfDefinition(AddressOfExpr aoe) or
-      TPatternDefinition(TopLevelPatternDecl tlpd) or
+      TPatternDefinition(LocalVariablePatternDecl lvpd) or
       TAssignOperationDefinition(AssignOperation ao) {
         ao instanceof AssignCallExpr and not ao instanceof CompoundAssignmentOperatorCall
         or
@@ -750,24 +750,31 @@ module AssignableDefinitions {
   }
 
   /**
-   * A local variable definition in a pattern, for example `x is int i`.
+   * A local variable definition in a pattern, for example `int i` in `x is int i`.
    */
   class PatternDefinition extends AssignableDefinition, TPatternDefinition {
-    TopLevelPatternDecl tlpd;
+    LocalVariablePatternDecl lvpd;
 
-    PatternDefinition() { this = TPatternDefinition(tlpd) }
+    PatternDefinition() { this = TPatternDefinition(lvpd) }
 
     /** Gets the element matches against this pattern. */
-    PatternMatch getMatch() { result = tlpd.getMatch() }
+    PatternMatch getMatch() { result = lvpd.getMatch() }
 
     /** Gets the underlying local variable declaration. */
-    LocalVariableDeclExpr getDeclaration() { result = tlpd }
-
-    override Expr getSource() { result = this.getMatch().getExpr() }
+    LocalVariableDeclExpr getDeclaration() { result = lvpd }
 
     override string toString() { result = this.getDeclaration().toString() }
   }
 
+  /**
+   * A local variable definition at the top level of a pattern.
+   */
+  class TopLevelPatternDefinition extends PatternDefinition {
+    TopLevelPatternDefinition() { lvpd.isTopLevel() }
+
+    override Expr getSource() { result = this.getMatch().getExpr() }
+  }
+
   /**
    * An initializer definition for a field or a property, for example
    * line 2 in
 
@@ -110,7 +110,7 @@ private predicate nonNullDef(SsaExplicitWrite def) {
   def.getValue() instanceof NonNullExpr
   or
   exists(AssignableDefinition ad | ad = def.getDefinition() |
-    ad instanceof AssignableDefinitions::PatternDefinition
+    ad instanceof AssignableDefinitions::TopLevelPatternDefinition
     or
     ad =
       any(AssignableDefinitions::LocalVariableDefinition d |
 
@@ -2677,7 +2677,7 @@ class CastNode extends Node {
     this.asExpr() instanceof Cast
     or
     this.(AssignableDefinitionNode).getDefinition() instanceof
-      AssignableDefinitions::PatternDefinition
+      AssignableDefinitions::TopLevelPatternDefinition
   }
 }
 
 
@@ -35,7 +35,7 @@ class RelevantDefinition extends AssignableDefinition {
         not lvde.getName() = "_"
       )
     or
-    this instanceof AssignableDefinitions::PatternDefinition
+    this instanceof AssignableDefinitions::TopLevelPatternDefinition
     or
     this instanceof AssignableDefinitions::AssignOperationDefinition
   }
Original file line number	Diff line number	Diff line change
`@@ -2677,7 +2677,7 @@ class CastNode extends Node {`
`2677`	`2677`	`this.asExpr() instanceof Cast`
`2678`	`2678`	`or`
`2679`	`2679`	`this.(AssignableDefinitionNode).getDefinition() instanceof`
`2680`		`- AssignableDefinitions::PatternDefinition`
	`2680`	`+ AssignableDefinitions::TopLevelPatternDefinition`
`2681`	`2681`	`}`
`2682`	`2682`	`}`
`2683`	`2683`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class RelevantDefinition extends AssignableDefinition {`
`35`	`35`	`not lvde.getName() = "_"`
`36`	`36`	`)`
`37`	`37`	`or`
`38`		`- this instanceof AssignableDefinitions::PatternDefinition`
	`38`	`+ this instanceof AssignableDefinitions::TopLevelPatternDefinition`
`39`	`39`	`or`
`40`	`40`	`this instanceof AssignableDefinitions::AssignOperationDefinition`
`41`	`41`	`}`