From b5cf776830151870730d32323502084d069668c3 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 17 Feb 2025 11:48:54 +0000 Subject: [PATCH] Use new name canonicalization approach --- src/llvm_backend_general.cpp | 8 +++++--- src/name_canonicalization.cpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp index dc212e51d..6ff166899 100644 --- a/src/llvm_backend_general.cpp +++ b/src/llvm_backend_general.cpp @@ -1568,10 +1568,12 @@ gb_internal String lb_set_nested_type_name_ir_mangled_name(Entity *e, lbProcedur gb_internal String lb_get_entity_name(lbModule *m, Entity *e) { GB_ASSERT(m != nullptr); - if (e != nullptr && e->kind == Entity_TypeName && e->TypeName.ir_mangled_name.len != 0) { - return e->TypeName.ir_mangled_name; - } GB_ASSERT(e != nullptr); + if (e->kind == Entity_TypeName && e->TypeName.ir_mangled_name.len != 0) { + return e->TypeName.ir_mangled_name; + } else if (e->kind == Entity_Procedure && e->Procedure.link_name.len != 0) { + return e->Procedure.link_name; + } if (e->pkg == nullptr) { return e->token.string; diff --git a/src/name_canonicalization.cpp b/src/name_canonicalization.cpp index fa09f27c0..48f7a18cb 100644 --- a/src/name_canonicalization.cpp +++ b/src/name_canonicalization.cpp @@ -180,7 +180,7 @@ gb_internal gbString write_canonical_entity_name(gbString w, Entity *e) { w = gb_string_appendc(w, gb_bprintf(".[%.*s].", LIT(file_name))); goto write_base_name; } - gb_printf_err("%s HERE %s %u %p\n", token_pos_to_string(e->token.pos), type_to_string(e->type), s->flags, s->decl_info); + gb_printf_err("%s WEIRD ENTITY TYPE %s %u %p\n", token_pos_to_string(e->token.pos), type_to_string(e->type), s->flags, s->decl_info); print_scope_flags(s); GB_PANIC("weird entity"); }