vala: Catch and throw possible inner error of lock statements

See 40c1dbfbfedb6c4a6b88df045eb1c2e7bdd38d93

Fixes https://gitlab.gnome.org/GNOME/vala/issues/83

1 files changed, 9 insertions, 1 deletions

diff --git a/vala/valalockstatement.vala b/vala/valalockstatement.vala
index 65c579be6..1035e9efc 100644
--- a/vala/valalockstatement.vala
+++ b/vala/valalockstatement.vala
@@ -89,9 +89,17 @@ public class Vala.LockStatement : CodeNode, Statement {
 			var fin_body = new Block (source_reference);
 			fin_body.add_statement (new UnlockStatement (resource, source_reference));
 
+			var catch_body = new Block (source_reference);
+			catch_body.add_statement (new ThrowStatement (new ReferenceTransferExpression (new MemberAccess.simple ("_lock_error_")), source_reference));
+			var catch_clause = new CatchClause (new ErrorType (null, null), "_lock_error_", catch_body, source_reference);
+			catch_clause.error_type.value_owned = true;
+
+			var try_stmt = new TryStatement (body, fin_body, source_reference);
+			try_stmt.add_catch_clause (catch_clause);
+
 			var block = new Block (source_reference);
 			block.add_statement (new LockStatement (resource, null, source_reference));
-			block.add_statement (new TryStatement (body, fin_body, source_reference));
+			block.add_statement (try_stmt);
 
 			var parent_block = (Block) parent_node;
 			parent_block.replace_statement (this, block);