Dont check return expr in assignments (#11114)

HaxeFoundation · Apr 11, 2023 · ea162bc · ea162bc
1 parent b55358d
commit ea162bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/typing/nullSafety.ml b/src/typing/nullSafety.ml
@@ -1040,7 +1040,7 @@ class expr_checker mode immediate_execution report =
 				| TMeta (m, _) when contains_unsafe_meta [m] -> false
 				| TMeta (_, e) -> self#is_nullable_expr e
 				| TThrow _ -> false
-				| TReturn (Some e) -> self#is_nullable_expr e
+				| TReturn _ -> false
 				| TBinop ((OpAssign | OpAssignOp _), _, right) -> self#is_nullable_expr right
 				| TBlock exprs ->
 					local_safety#block_declared;

diff --git a/tests/nullsafety/src/cases/TestLoose.hx b/tests/nullsafety/src/cases/TestLoose.hx
@@ -99,4 +99,18 @@ class TestLoose {
 			}
 		}
 	}
-}
+
+	static function nullCoal_returnNull_shouldPass(token:{children:Array<Int>}):Null<Bool> {
+		final children = token.children ?? return null;
+		var i = children.length;
+		return null;
+	}
+
+	static function localFunc_returnNullCoal_shouldFail():Void {
+		function foo() {
+			final x = (null : Null<Bool>) ?? return null;
+			return x;
+		}
+		shouldFail(if (foo()) {});
+	}
+}