From ff1c4e1f13943b63dcb6d257a2ee58ae88d4b12a Mon Sep 17 00:00:00 2001
From: Alexandros Naskos <alex_naskos@hotmail.com>
Date: Tue, 1 May 2018 13:00:39 +0300
Subject: [PATCH] Added tests.

---
 src/ir.cpp              |  1 -
 test/cases/union.zig    | 10 ++++++++++
 test/compile_errors.zig | 12 ++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/ir.cpp b/src/ir.cpp
index 3bce9c51cd..dfffb41873 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -15975,7 +15975,6 @@ static void ir_make_type_info_defs(IrAnalyze *ira, ConstExprValue *out_val, Scop
                     ensure_field_index(fn_def_val->type, "return_type", 7);
                     fn_def_fields[7].special = ConstValSpecialStatic;
                     fn_def_fields[7].type = ira->codegen->builtin_types.entry_type;
-                    // @TODO Check whether this is correct.
                     if (fn_entry->src_implicit_return_type != nullptr)
                         fn_def_fields[7].data.x_type = fn_entry->src_implicit_return_type;
                     else if (fn_entry->type_entry->data.fn.gen_return_type != nullptr)
diff --git a/test/cases/union.zig b/test/cases/union.zig
index dc2a7c3414..e7d9c23d77 100644
--- a/test/cases/union.zig
+++ b/test/cases/union.zig
@@ -45,6 +45,16 @@ test "basic unions" {
     assert(foo.float == 12.34);
 }
 
+test "comptime union field access" {
+    comptime {
+        var foo = Foo { .int = 0 };
+        assert(foo.int == 0);
+
+        foo = Foo { .float = 42.42 };
+        assert(foo.float == 42.42);
+    }
+}
+
 test "init union with runtime value" {
     var foo: Foo = undefined;
 
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index f8febc27b8..d9454adf2c 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -3209,4 +3209,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
         \\}
     ,
         ".tmp_source.zig:5:42: error: zero-bit field 'val' in struct 'Empty' has no offset");
+
+    cases.add("invalid union field access in comptime",
+        \\const Foo = union {
+        \\    Bar: u8,
+        \\    Baz: void,
+        \\};
+        \\comptime {
+        \\    var foo = Foo {.Baz = {}};    
+        \\    const bar_val = foo.Bar;
+        \\}
+    ,
+        ".tmp_source.zig:7:24: error: accessing union field 'Bar' while field 'Baz' is set");
 }