From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 17 Aug 2020 14:33:44 +0000 (+0200)
Subject: Revert "codegen: Don't append unreachable clean-up section of Block"
X-Git-Tag: 0.40.24~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3205bc4c01d7877908552ddd1023ead0eb1d649;p=thirdparty%2Fvala.git

Revert "codegen: Don't append unreachable clean-up section of Block"

This reverts commit 8f3a0a0b64e0c7fbcc9231c3058247920dd6eeda.
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index a58caef9d..89a04130e 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2333,13 +2333,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			}
 		}
 
-		bool unreachable_exit_block = false;
-		if (b.parent_symbol is Subroutine) {
-			unowned BasicBlock? exit_block = ((Subroutine) b.parent_symbol).exit_block;
-			unreachable_exit_block = (exit_block == null || exit_block.get_predecessors ().size <= 0);
-		}
-
-		if (!unreachable_exit_block && b.parent_symbol is Method) {
+		if (b.parent_symbol is Method) {
 			var m = (Method) b.parent_symbol;
 			foreach (Parameter param in m.get_parameters ()) {
 				if (!param.captured && !param.ellipsis && requires_destroy (param.variable_type) && param.direction == ParameterDirection.IN) {
@@ -2348,14 +2342,14 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 					return_out_parameter (param);
 				}
 			}
-		} else if (!unreachable_exit_block && b.parent_symbol is PropertyAccessor) {
+		} else if (b.parent_symbol is PropertyAccessor) {
 			var acc = (PropertyAccessor) b.parent_symbol;
 			if (acc.value_parameter != null && !acc.value_parameter.captured && requires_destroy (acc.value_parameter.variable_type)) {
 				ccode.add_expression (destroy_parameter (acc.value_parameter));
 			}
 		}
 
-		if (!unreachable_exit_block && b.captured) {
+		if (b.captured) {
 			int block_id = get_block_id (b);
 
 			var data_unref = new CCodeFunctionCall (new CCodeIdentifier ("block%d_data_unref".printf (block_id)));