Commit 0d62c929470458e30b888f76d029fff48d31fd3b | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-06-12 19:43:24-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-06-12 19:43:24-04:00
log	0d62c929470458e30b888f76d029fff48d31fd3b
tree	0b8b0e54681df1cd8068504ce61eac260f010c08
parent	e6fa2ee70632ef1efbe3ebc54214abf30d6d40c1
signature	Commit is signed but in an unrecognized format.

fix declref not writing to result loc

```zig
const a: i32 = 0;
const b: i32 = 1;
const c: i32 = 2;
const d: i32 = 3;

export fn entry(x: bool) i32 {
    return if (x)
        if (x)
            a
        else if (x)
            b
        else
            c
    else
        d;
}
```

3 files changed, 10 insertions(+), 6 deletions(-)

BRANCH_TODO
src
- all_types.hpp
- ir.cpp

BRANCH_TODO-2

...	@@ -10,5 +10,3 @@ get an empty file compiling successfully (with no panic fn override)	...	@@ -10,5 +10,3 @@ get an empty file compiling successfully (with no panic fn override)
10		10
11	uncomment all the behavior tests	11	uncomment all the behavior tests
12		12
13	look at all the ir_gen_node ir_gen_node_extra calls and make sure result locations are properly propagated
14	return ir_gen_comptime(irb, scope, node, lval);

src/all_types.hpp+1-1

 @@ -3247,8 +3247,8 @@ struct IrInstructionTypeName {
 struct IrInstructionDeclRef {
     IrInstruction base;
-    Tld *tld;
     LVal lval;
+    Tld *tld;
 };
 struct IrInstructionPanic {

src/ir.cpp+9-3

 @@ -4166,8 +4166,14 @@ static IrInstruction *ir_gen_symbol(IrBuilder *irb, Scope *scope, AstNode *node,
     }
     Tld *tld = find_decl(irb->codegen, scope, variable_name);
-    if (tld)
+    if (tld) {
-        return ir_build_decl_ref(irb, scope, node, tld, lval);
+        IrInstruction *decl_ref = ir_build_decl_ref(irb, scope, node, tld, lval);
+        if (lval == LValPtr) {
+            return decl_ref;
+        } else {
+            return ir_expr_wrap(irb, scope, decl_ref, result_loc);
+        }
+    }
     if (get_container_scope(node->owner)->any_imports_failed) {
         // skip the error message since we had a failing import in this file
 @@ -16503,7 +16509,7 @@ static IrInstruction *ir_analyze_instruction_phi(IrAnalyze *ira, IrInstructionPh
         IrInstruction *branch_instruction = predecessor->instruction_list.pop();
         ir_set_cursor_at_end(&ira->new_irb, predecessor);
         IrInstruction *casted_value = ir_implicit_cast(ira, new_value, resolved_type);
-        if (casted_value == ira->codegen->invalid_instruction) {
+        if (type_is_invalid(casted_value->value.type)) {
             return ira->codegen->invalid_instruction;
         }
         new_incoming_values.items[i] = casted_value;