From 12f459b5fb7904bfa926b5ad3fc5f80c6b5b4193 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Mon, 3 Jan 2022 13:12:39 +0000
Subject: Fix #1344

---
 src/check_stmt.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'src/check_stmt.cpp')

diff --git a/src/check_stmt.cpp b/src/check_stmt.cpp
index 396388629..c3b8c46ca 100644
--- a/src/check_stmt.cpp
+++ b/src/check_stmt.cpp
@@ -58,6 +58,30 @@ bool contains_deferred_call(Ast *node) {
 	return false;
 }
 
+Ast *last_stmt_blocking_in_list(Slice<Ast *> const &stmts) {
+	for_array(i, stmts) {
+		Ast *n = stmts[i];
+		switch (n->kind) {
+		case Ast_ReturnStmt:
+			return n;
+		case Ast_BranchStmt:
+			return n;
+		case Ast_ExprStmt:
+			if (is_diverging_stmt(n)) {
+				return n;
+			}
+			break;
+		case Ast_BlockStmt:
+			n = last_stmt_blocking_in_list(n->BlockStmt.stmts);
+			if (n != nullptr) {
+				return n;
+			}
+			break;
+		}
+	}
+	return nullptr;
+}
+
 void check_stmt_list(CheckerContext *ctx, Slice<Ast *> const &stmts, u32 flags) {
 	if (stmts.count == 0) {
 		return;
@@ -102,6 +126,7 @@ void check_stmt_list(CheckerContext *ctx, Slice<Ast *> const &stmts, u32 flags)
 		check_stmt(ctx, n, new_flags);
 
 		if (i+1 < max_non_constant_declaration) {
+		never_executed_error:;
 			switch (n->kind) {
 			case Ast_ReturnStmt:
 				error(n, "Statements after this 'return' are never executed");
@@ -116,6 +141,13 @@ void check_stmt_list(CheckerContext *ctx, Slice<Ast *> const &stmts, u32 flags)
 					error(n, "Statements after a diverging procedure call are never executed");
 				}
 				break;
+
+			case Ast_BlockStmt:
+				n = last_stmt_blocking_in_list(n->BlockStmt.stmts);
+				if (n != nullptr) {
+					goto never_executed_error;
+				}
+				break;
 			}
 		} else if (i+1 == max_non_constant_declaration) {
 			if (is_diverging_stmt(n)) {
-- 
cgit v1.2.3