aboutsummaryrefslogtreecommitdiff
path: root/src/codegen.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-12-28 03:47:02 -0500
committerAndrew Kelley <superjoe30@gmail.com>2016-12-28 03:47:02 -0500
commita9acc8cb4574ce8f1792fbfa9bd93985a6b47f87 (patch)
treed31ec81c7dec180d4f744950e8d504b18c3aa761 /src/codegen.cpp
parentdc26dec8e0c86c42485842eb3949edfe816f0e55 (diff)
downloadzig-a9acc8cb4574ce8f1792fbfa9bd93985a6b47f87.tar.gz
zig-a9acc8cb4574ce8f1792fbfa9bd93985a6b47f87.zip
IR: error for returning from defer expression
also fix peer type resolution for pure error mixed with error union
Diffstat (limited to 'src/codegen.cpp')
-rw-r--r--src/codegen.cpp2
1 files changed, 2 insertions, 0 deletions
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();
}