From 722b9b9e595027e76ab4255f13ad0eca539358ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Sat, 14 Jul 2018 01:12:23 +0200
Subject: [PATCH 1/2] codegen: Store returned value if type is 'handle_is_ptr'
 and function is not 'first_arg_ret'.

Seems to fix #1230, includes test.
---
 src/codegen.cpp          |  4 ++++
 test/behavior.zig        |  1 +
 test/cases/bugs/1230.zig | 11 +++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 test/cases/bugs/1230.zig

diff --git a/src/codegen.cpp b/src/codegen.cpp
index 3f54c120b4..0bcc211164 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -3166,6 +3166,10 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstr
         return nullptr;
     } else if (first_arg_ret) {
         return instruction->tmp_ptr;
+    } else if (handle_is_ptr(src_return_type)) {
+        auto store_instr = LLVMBuildStore(g->builder, result, instruction->tmp_ptr);
+        LLVMSetAlignment(store_instr, LLVMGetAlignment(instruction->tmp_ptr));
+        return instruction->tmp_ptr;
     } else {
         return result;
     }
diff --git a/test/behavior.zig b/test/behavior.zig
index 450dded56c..21b1c597e1 100644
--- a/test/behavior.zig
+++ b/test/behavior.zig
@@ -9,6 +9,7 @@ comptime {
     _ = @import("cases/bitcast.zig");
     _ = @import("cases/bool.zig");
     _ = @import("cases/bugs/1111.zig");
+    _ = @import("cases/bugs/1230.zig");
     _ = @import("cases/bugs/394.zig");
     _ = @import("cases/bugs/655.zig");
     _ = @import("cases/bugs/656.zig");
diff --git a/test/cases/bugs/1230.zig b/test/cases/bugs/1230.zig
new file mode 100644
index 0000000000..3fd22357d7
--- /dev/null
+++ b/test/cases/bugs/1230.zig
@@ -0,0 +1,11 @@
+const S = extern struct {
+    x: i32,
+};
+
+extern fn ret_struct() S {
+    return S { .x = 0 };
+}
+
+test "extern return small struct (bug 1230)" {
+    const s = ret_struct();
+}

From f78d4ed30c1bd92fc5ecc26c2d5f11751b406255 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Sat, 14 Jul 2018 11:31:46 -0400
Subject: [PATCH 2/2] add an assertion to the test

---
 test/cases/bugs/1230.zig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/cases/bugs/1230.zig b/test/cases/bugs/1230.zig
index 3fd22357d7..b782a77f0b 100644
--- a/test/cases/bugs/1230.zig
+++ b/test/cases/bugs/1230.zig
@@ -1,11 +1,14 @@
+const assert = @import("std").debug.assert;
+
 const S = extern struct {
     x: i32,
 };
 
 extern fn ret_struct() S {
-    return S { .x = 0 };
+    return S{ .x = 42 };
 }
 
 test "extern return small struct (bug 1230)" {
     const s = ret_struct();
+    assert(s.x == 42);
 }