From: Jürg Billeter <j@bitron.ch>
Date: Wed, 10 Mar 2010 16:11:50 +0000 (+0100)
Subject: Fix flow analysis for catch clauses with specific error types
X-Git-Tag: 0.8.0~218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9ef8541b2a7c2d0966a0dfde53306677089bd4f;p=thirdparty%2Fvala.git

Fix flow analysis for catch clauses with specific error types
---

diff --git a/vala/valaflowanalyzer.vala b/vala/valaflowanalyzer.vala
index 43baefd4c..a047128cf 100644
--- a/vala/valaflowanalyzer.vala
+++ b/vala/valaflowanalyzer.vala
@@ -1,6 +1,6 @@
 /* valaflowanalyzer.vala
  *
- * Copyright (C) 2008-2009  Jürg Billeter
+ * Copyright (C) 2008-2010  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -832,10 +832,20 @@ public class Vala.FlowAnalyzer : CodeVisitor {
 						    || (jump_target.error_domain == error_type.error_domain
 						        && (jump_target.error_code == null
 						            || jump_target.error_code == error_type.error_code))) {
+							// error can always be caught by this catch clause
+							// following catch clauses cannot be reached by this error
 							current_block.connect (jump_target.basic_block);
 							current_block = null;
 							unreachable_reported = false;
 							break;
+						} else if (error_type.error_domain == null
+						           || (error_type.error_domain == jump_target.error_domain
+						               && (error_type.error_code == null
+						                   || error_type.error_code == jump_target.error_code))) {
+							// error might be caught by this catch clause
+							// unknown at compile time
+							// following catch clauses might still be reached by this error
+							current_block.connect (jump_target.basic_block);
 						}
 					} else if (jump_target.is_finally_clause) {
 						current_block.connect (jump_target.basic_block);