From a9acc8cb4574ce8f1792fbfa9bd93985a6b47f87 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 28 Dec 2016 03:47:02 -0500
Subject: IR: error for returning from defer expression

also fix peer type resolution for pure error mixed with error union
---
 src/codegen.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/codegen.cpp')

diff --git a/src/codegen.cpp b/src/codegen.cpp
index 4a0b901687..130fb4f351 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -325,6 +325,8 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) {
             scope->di_scope = ZigLLVMLexicalBlockToScope(di_block);
             return scope->di_scope;
         }
+        case ScopeIdDeferExpr:
+            return get_di_scope(g, scope->parent);
     }
     zig_unreachable();
 }
-- 
cgit v1.2.3