Commit b3a4ec1bd209c022445b6f70385b3f88517e72f9 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-06-11 16:04:04-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-06-11 16:04:04-04:00
log	b3a4ec1bd209c022445b6f70385b3f88517e72f9
tree	7e94fb3e78bc209cc97ed48797bcde338beb6c07
parent	e1d14e73b5f9c7a8d1a92ccd36cb689d625faf57
signature	Commit is signed but in an unrecognized format.

fix returning scalar values

```zig
export fn entry1() i32 {
    return bar();
}
```

```llvm
define i32 @entry1() #2 !dbg !35 {
Entry:
  %0 = call fastcc i32 @bar(), !dbg !39
  ret i32 %0, !dbg !41
}
```

2 files changed, 7 insertions(+), 2 deletions(-)

src
- codegen.cpp
- ir.cpp

src/codegen.cpp+2-1

...	@@ -3564,7 +3564,8 @@ static LLVMValueRef ir_render_var_ptr(CodeGen g, IrExecutable executable, IrIn	...	@@ -3564,7 +3564,8 @@ static LLVMValueRef ir_render_var_ptr(CodeGen g, IrExecutable executable, IrIn
3564	static LLVMValueRef ir_render_return_ptr(CodeGen g, IrExecutable executable,	3564	static LLVMValueRef ir_render_return_ptr(CodeGen g, IrExecutable executable,
3565	IrInstructionReturnPtr *instruction)	3565	IrInstructionReturnPtr *instruction)
3566	{	3566	{
3567	assert(g->cur_ret_ptr != nullptr \|\| !type_has_bits(instruction->base.value.type));	3567	src_assert(g->cur_ret_ptr != nullptr \|\| !type_has_bits(instruction->base.value.type),
		3568	instruction->base.source_node);
3568	return g->cur_ret_ptr;	3569	return g->cur_ret_ptr;
3569	}	3570	}
3570		3571

src/ir.cpp+5-1

 @@ -14866,7 +14866,11 @@ static IrInstruction *ir_resolve_result(IrAnalyze *ira, IrInstruction *suspend_s
         }
         case ResultLocIdReturn: {
             bool is_comptime = value != nullptr && value->value.special != ConstValSpecialRuntime;
-            if (is_comptime) return nullptr;
+            if (is_comptime)
+                return nullptr;
+            if (!type_has_bits(ira->explicit_return_type) || !handle_is_ptr(ira->explicit_return_type))
+                return nullptr;
             ZigType *ptr_return_type = get_pointer_to_type(ira->codegen, ira->explicit_return_type, false);
             result_loc->written = true;
             result_loc->resolved_loc = ir_build_return_ptr(ira, result_loc->source_instruction, ptr_return_type);