Skip to content

Commit

Permalink
Fix canonicalization
Browse files Browse the repository at this point in the history
  • Loading branch information
@gingerBill
gingerBill committed Feb 24, 2025
1 parent 46a8991 commit f0f395c
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 8 deletions.
19 changes: 12 additions & 7 deletions src/llvm_backend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ gb_internal lbContextData *lb_push_context_onto_stack(lbProcedure *p, lbAddr ctx
}


gb_internal String lb_internal_gen_proc_name_from_type(char const *prefix, Type *type) {
gb_internal String lb_internal_gen_name_from_type(char const *prefix, Type *type) {
gbString str = gb_string_make(permanent_allocator(), prefix);
gbString tcs = temp_canonical_string(type);
str = gb_string_appendc(str, CANONICAL_TYPE_SEPARATOR);
Expand All @@ -259,7 +259,10 @@ gb_internal lbValue lb_equal_proc_for_type(lbModule *m, Type *type) {
}


String proc_name = lb_internal_gen_proc_name_from_type("__$equal", type);
String proc_name = lb_internal_gen_name_from_type("__$equal", type);
lbProcedure *p = lb_create_dummy_procedure(m, proc_name, t_equal_proc);
map_set(&m->equal_procs, type, p);
lb_begin_procedure_body(p);

// lb_add_attribute_to_proc(m, p->value, "readonly");
lb_add_attribute_to_proc(m, p->value, "nounwind");
Expand Down Expand Up @@ -418,7 +421,7 @@ gb_internal lbValue lb_hasher_proc_for_type(lbModule *m, Type *type) {
return {(*found)->value, (*found)->type};
}

String proc_name = lb_internal_gen_proc_name_from_type("__$hasher", type);
String proc_name = lb_internal_gen_name_from_type("__$hasher", type);

lbProcedure *p = lb_create_dummy_procedure(m, proc_name, t_hasher_proc);
map_set(&m->hasher_procs, type, p);
Expand Down Expand Up @@ -581,7 +584,7 @@ gb_internal lbValue lb_map_get_proc_for_type(lbModule *m, Type *type) {
return {(*found)->value, (*found)->type};
}

String proc_name = lb_internal_gen_proc_name_from_type("__$map_get", type);
String proc_name = lb_internal_gen_name_from_type("__$map_get", type);

lbProcedure *p = lb_create_dummy_procedure(m, proc_name, t_map_get_proc);
map_set(&m->map_get_procs, type, p);
Expand Down Expand Up @@ -758,7 +761,7 @@ gb_internal lbValue lb_map_set_proc_for_type(lbModule *m, Type *type) {
return {(*found)->value, (*found)->type};
}

String proc_name = lb_internal_gen_proc_name_from_type("__$map_set", type);
String proc_name = lb_internal_gen_name_from_type("__$map_set", type);

lbProcedure *p = lb_create_dummy_procedure(m, proc_name, t_map_set_proc);
map_set(&m->map_set_procs, type, p);
Expand Down Expand Up @@ -906,7 +909,9 @@ gb_internal lbValue lb_gen_map_cell_info_ptr(lbModule *m, Type *type) {
LLVMValueRef llvm_res = llvm_const_named_struct(m, t_map_cell_info, const_values, gb_count_of(const_values));
lbValue res = {llvm_res, t_map_cell_info};

lbAddr addr = lb_add_global_generated(m, t_map_cell_info, res, nullptr);
lbAddr addr = lb_add_global_generated_with_name(m, t_map_cell_info, res, lb_internal_gen_name_from_type("ggv$map_cell_info", type));

lb_add_global_generated(m, t_map_cell_info, res, nullptr);
lb_make_global_private_const(addr);

map_set(&m->map_cell_info_map, type, addr);
Expand Down Expand Up @@ -937,7 +942,7 @@ gb_internal lbValue lb_gen_map_info_ptr(lbModule *m, Type *map_type) {
LLVMValueRef llvm_res = llvm_const_named_struct(m, t_map_info, const_values, gb_count_of(const_values));
lbValue res = {llvm_res, t_map_info};

lbAddr addr = lb_add_global_generated(m, t_map_info, res, nullptr);
lbAddr addr = lb_add_global_generated_with_name(m, t_map_info, res, lb_internal_gen_name_from_type("ggv$map_info", map_type));
lb_make_global_private_const(addr);

map_set(&m->map_info_map, map_type, addr);
Expand Down
2 changes: 1 addition & 1 deletion src/llvm_backend.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ gb_internal LLVMTypeRef llvm_array_type(LLVMTypeRef ElementType, uint64_t Elemen
}


gb_internal String lb_internal_gen_proc_name_from_type(char const *prefix, Type *type);
gb_internal String lb_internal_gen_name_from_type(char const *prefix, Type *type);


gb_internal void lb_set_metadata_custom_u64(lbModule *m, LLVMValueRef v_ref, String name, u64 value);
Expand Down
26 changes: 26 additions & 0 deletions src/llvm_backend_general.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2814,6 +2814,32 @@ gb_internal lbAddr lb_add_global_generated(lbModule *m, Type *type, lbValue valu
return lb_addr(g);
}

gb_internal lbAddr lb_add_global_generated_with_name(lbModule *m, Type *type, lbValue value, String name) {
GB_ASSERT(type != nullptr);
type = default_type(type);

isize max_len = 7+8+1;
u8 *str = cast(u8 *)gb_alloc_array(permanent_allocator(), u8, max_len);

Scope *scope = nullptr;
Entity *e = alloc_entity_variable(scope, make_token_ident(name), type);
lbValue g = {};
g.type = alloc_type_pointer(type);
g.value = LLVMAddGlobal(m->mod, lb_type(m, type), cast(char const *)str);
if (value.value != nullptr) {
GB_ASSERT_MSG(LLVMIsConstant(value.value), LLVMPrintValueToString(value.value));
LLVMSetInitializer(g.value, value.value);
} else {
LLVMSetInitializer(g.value, LLVMConstNull(lb_type(m, type)));
}

lb_add_entity(m, e, g);
lb_add_member(m, name, g);

return lb_addr(g);
}


gb_internal lbValue lb_find_runtime_value(lbModule *m, String const &name) {
AstPackage *p = m->info->runtime_package;
Entity *e = scope_lookup_current(p->scope, name);
Expand Down

0 comments on commit f0f395c

Please sign in to comment.