diff options
| author | DYSEQTA <7029061+DYSEQTA@users.noreply.github.com> | 2021-11-24 12:07:14 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 12:07:14 +1100 |
| commit | 0a87ffe0e601d1092034a39ac6365e1a81e3bba1 (patch) | |
| tree | 24e743182d1f379c78154041cbe916d3154f73a0 /src/llvm_backend_expr.cpp | |
| parent | e5f961b48f52f8346f00d43fea4700c8513c53c3 (diff) | |
| parent | 5db505c42f83d5be628a3e56d6cd471a9e790428 (diff) | |
Merge branch 'odin-lang:master' into master
Diffstat (limited to 'src/llvm_backend_expr.cpp')
| -rw-r--r-- | src/llvm_backend_expr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/llvm_backend_expr.cpp b/src/llvm_backend_expr.cpp index 7f162856c..5187279fa 100644 --- a/src/llvm_backend_expr.cpp +++ b/src/llvm_backend_expr.cpp @@ -1369,7 +1369,7 @@ lbValue lb_build_binary_expr(lbProcedure *p, Ast *expr) { Type *rt = base_type(right.type); if (is_type_pointer(rt)) { right = lb_emit_load(p, right); - rt = type_deref(rt); + rt = base_type(type_deref(rt)); } switch (rt->kind) { @@ -1841,7 +1841,6 @@ lbValue lb_emit_conv(lbProcedure *p, lbValue value, Type *t) { return res; } - #if 1 if (is_type_union(dst)) { for_array(i, dst->Union.variants) { Type *vt = dst->Union.variants[i]; @@ -1852,7 +1851,6 @@ lbValue lb_emit_conv(lbProcedure *p, lbValue value, Type *t) { } } } - #endif // NOTE(bill): This has to be done before 'Pointer <-> Pointer' as it's // subtype polymorphism casting |