additionally include writes under try/catch/finally

scala · Jul 24, 2023 · 74f6851 · 74f6851
1 parent f351ec4
commit 74f6851
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/typer/Nullables.scala b/compiler/src/dotty/tools/dotc/typer/Nullables.scala
@@ -445,7 +445,7 @@ object Nullables:
                 else candidates -= name
               case None =>
             traverseChildren(tree)
-          case _: (If | WhileDo | Typed | Match | CaseDef) =>
+          case _: (If | WhileDo | Typed | Match | CaseDef | untpd.ParsedTry) =>
             traverseChildren(tree)      // assignments to candidate variables are OK here ...
           case _ =>
             reachable = Set.empty       // ... but not here

diff --git a/tests/explicit-nulls/pos/match-flow-typing.scala b/tests/explicit-nulls/pos/match-flow-typing.scala
@@ -6,3 +6,16 @@ def m(): String = {
   if(x == null) "foo"
   else x
 }
+
+def m2(): String = {
+  var x: String|Null = "foo"
+  try {
+    x = x
+  } catch {
+    case e => x = x
+  } finally {
+    x = x
+  }
+  if(x == null) "foo"
+  else x
+}