From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 20 Feb 2020 14:26:46 +0000 (+0100)
Subject: vala: Don't analyze error-type of errornous catch-clauses
X-Git-Tag: 0.47.92~4
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fkeep-around%2F98fd2b1d7a669096bfa1e90e65313e1dc8200449;p=thirdparty%2Fvala.git

vala: Don't analyze error-type of errornous catch-clauses
---

diff --git a/vala/valaflowanalyzer.vala b/vala/valaflowanalyzer.vala
index 978ab94f8..03aae237f 100644
--- a/vala/valaflowanalyzer.vala
+++ b/vala/valaflowanalyzer.vala
@@ -987,7 +987,7 @@ public class Vala.FlowAnalyzer : CodeVisitor {
 			var error_block = new BasicBlock ();
 			all_basic_blocks.add (error_block);
 
-			if (catch_clause.error_type != null) {
+			if (catch_clause.error_type != null && !catch_clause.error) {
 				if (context.profile == Profile.GOBJECT) {
 					unowned ErrorType error_type = (ErrorType) catch_clause.error_type;
 					jump_stack.add (new JumpTarget.error_target (error_block, catch_clause, catch_clause.error_type.type_symbol as ErrorDomain, error_type.error_code, null));