Fix #2305

1 files changed, 8 insertions, 1 deletions

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);
+					}
 				}
 			}
 		}