From 68b2d4b9e243d40a8e488f5f623532a46a53fb3a Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 16 Jan 2023 11:41:58 +0000 Subject: [PATCH] Fix #2305 --- src/llvm_backend_expr.cpp | 3 +++ src/llvm_backend_proc.cpp | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/llvm_backend_expr.cpp b/src/llvm_backend_expr.cpp index c28e9fb2b..1fa4b4809 100644 --- a/src/llvm_backend_expr.cpp +++ b/src/llvm_backend_expr.cpp @@ -3097,6 +3097,9 @@ gb_internal lbValue lb_build_expr_internal(lbProcedure *p, Ast *expr) { // NOTE(bill): Short on constant values return lb_const_value(p->module, type, tv.value); + } else if (tv.mode == Addressing_Type) { + // NOTE(bill, 2023-01-16): is this correct? I hope so at least + return lb_typeid(m, tv.type); } switch (expr->kind) { diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index f156d1ca0..b95fc7da6 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -3125,6 +3125,8 @@ gb_internal lbValue lb_build_call_expr_internal(lbProcedure *p, Ast *expr) { GB_ASSERT(e->kind == Entity_Variable); if (args[i].value == nullptr) { args[i] = lb_handle_param_value(p, e->type, e->Variable.param_value, ast_token(expr).pos); + } else if (is_type_typeid(e->type) && !is_type_typeid(args[i].type)) { + args[i] = lb_typeid(p->module, args[i].type); } else { args[i] = lb_emit_conv(p, args[i], e->type); } @@ -3274,7 +3276,12 @@ gb_internal lbValue lb_build_call_expr_internal(lbProcedure *p, Ast *expr) { continue; } GB_ASSERT_MSG(args[i].value != nullptr, "%.*s", LIT(e->token.string)); - args[i] = lb_emit_conv(p, args[i], e->type); + if (is_type_typeid(e->type) && !is_type_typeid(args[i].type)) { + GB_ASSERT(LLVMIsNull(args[i].value)); + args[i] = lb_typeid(p->module, args[i].type); + } else { + args[i] = lb_emit_conv(p, args[i], e->type); + } } } }