mirror of
https://github.com/Ed94/Odin.git
synced 2026-07-18 16:51:31 -07:00
optimize fix
This commit is contained in:
+2
-10
@@ -1147,22 +1147,14 @@ gb_internal void lb_finalize_objc_names(lbProcedure *p) {
|
||||
String name = entry.key;
|
||||
args[0] = lb_const_value(m, t_cstring, exact_value_string(name));
|
||||
lbValue ptr = lb_emit_runtime_call(p, "objc_lookUpClass", args);
|
||||
|
||||
lbValue ptr_ = lb_find_value_from_entity(m, entry.value);
|
||||
lbAddr local_addr = lb_addr(ptr_);
|
||||
|
||||
lb_addr_store(p, local_addr, ptr);
|
||||
lb_addr_store(p, entry.value.local_module_addr, ptr);
|
||||
}
|
||||
|
||||
for (auto const &entry : m->objc_selectors) {
|
||||
String name = entry.key;
|
||||
args[0] = lb_const_value(m, t_cstring, exact_value_string(name));
|
||||
lbValue ptr = lb_emit_runtime_call(p, "sel_registerName", args);
|
||||
|
||||
lbValue ptr_ = lb_find_value_from_entity(m, entry.value);
|
||||
lbAddr local_addr = lb_addr(ptr_);
|
||||
|
||||
lb_addr_store(p, local_addr, ptr);
|
||||
lb_addr_store(p, entry.value.local_module_addr, ptr);
|
||||
}
|
||||
|
||||
lb_end_procedure_body(p);
|
||||
|
||||
@@ -143,6 +143,11 @@ struct lbPadType {
|
||||
LLVMTypeRef type;
|
||||
};
|
||||
|
||||
struct lbObjcRef {
|
||||
Entity * entity;
|
||||
lbAddr local_module_addr;
|
||||
};
|
||||
|
||||
struct lbModule {
|
||||
LLVMModuleRef mod;
|
||||
LLVMContextRef ctx;
|
||||
@@ -196,8 +201,8 @@ struct lbModule {
|
||||
RecursiveMutex debug_values_mutex;
|
||||
PtrMap<void *, LLVMMetadataRef> debug_values;
|
||||
|
||||
StringMap<Entity *> objc_classes;
|
||||
StringMap<Entity *> objc_selectors;
|
||||
StringMap<lbObjcRef> objc_classes;
|
||||
StringMap<lbObjcRef> objc_selectors;
|
||||
|
||||
PtrMap<Type *, lbAddr> map_cell_info_map; // address of runtime.Map_Info
|
||||
PtrMap<Type *, lbAddr> map_info_map; // address of runtime.Map_Cell_Info
|
||||
|
||||
@@ -2093,33 +2093,31 @@ gb_internal void lb_set_wasm_export_attributes(LLVMValueRef value, String export
|
||||
|
||||
|
||||
gb_internal lbAddr lb_handle_objc_find_or_register_selector(lbProcedure *p, String const &name) {
|
||||
lbObjcRef *found = string_map_get(&p->module->objc_selectors, name);
|
||||
if (found) {
|
||||
return found->local_module_addr;
|
||||
}
|
||||
|
||||
lbModule *default_module = &p->module->gen->default_module;
|
||||
Entity *entity = {};
|
||||
|
||||
Entity **found = string_map_get(&p->module->objc_selectors, name);
|
||||
if (found) {
|
||||
entity = *found;
|
||||
if (default_module != p->module) {
|
||||
found = string_map_get(&default_module->objc_selectors, name);
|
||||
if (found) {
|
||||
entity = found->entity;
|
||||
}
|
||||
}
|
||||
|
||||
if (!entity) {
|
||||
if (default_module != p->module) {
|
||||
found = string_map_get(&default_module->objc_selectors, name);
|
||||
if (found) {
|
||||
entity = *found;
|
||||
}
|
||||
}
|
||||
|
||||
if (!entity) {
|
||||
lbAddr default_addr = lb_add_global_generated(default_module, t_objc_SEL, {}, &entity);
|
||||
string_map_set(&default_module->objc_selectors, name, entity);
|
||||
}
|
||||
lbAddr default_addr = lb_add_global_generated(default_module, t_objc_SEL, {}, &entity);
|
||||
string_map_set(&default_module->objc_selectors, name, lbObjcRef{entity, default_addr});
|
||||
}
|
||||
|
||||
lbValue ptr = lb_find_value_from_entity(p->module, entity);
|
||||
lbAddr local_addr = lb_addr(ptr);
|
||||
|
||||
if (default_module != p->module) {
|
||||
string_map_set(&p->module->objc_selectors, name, entity);
|
||||
string_map_set(&p->module->objc_selectors, name, lbObjcRef{entity, local_addr});
|
||||
}
|
||||
|
||||
return local_addr;
|
||||
@@ -2152,33 +2150,31 @@ gb_internal lbValue lb_handle_objc_register_selector(lbProcedure *p, Ast *expr)
|
||||
}
|
||||
|
||||
gb_internal lbAddr lb_handle_objc_find_or_register_class(lbProcedure *p, String const &name) {
|
||||
lbObjcRef *found = string_map_get(&p->module->objc_classes, name);
|
||||
if (found) {
|
||||
return found->local_module_addr;
|
||||
}
|
||||
|
||||
lbModule *default_module = &p->module->gen->default_module;
|
||||
Entity *entity = {};
|
||||
|
||||
Entity **found = string_map_get(&p->module->objc_classes, name);
|
||||
if (found) {
|
||||
entity = *found;
|
||||
if (default_module != p->module) {
|
||||
found = string_map_get(&default_module->objc_classes, name);
|
||||
if (found) {
|
||||
entity = found->entity;
|
||||
}
|
||||
}
|
||||
|
||||
if (!entity) {
|
||||
if (default_module != p->module) {
|
||||
found = string_map_get(&default_module->objc_classes, name);
|
||||
if (found) {
|
||||
entity = *found;
|
||||
}
|
||||
}
|
||||
|
||||
if (!entity) {
|
||||
lbAddr default_addr = lb_add_global_generated(default_module, t_objc_Class, {}, &entity);
|
||||
string_map_set(&default_module->objc_classes, name, entity);
|
||||
}
|
||||
lbAddr default_addr = lb_add_global_generated(default_module, t_objc_Class, {}, &entity);
|
||||
string_map_set(&default_module->objc_classes, name, lbObjcRef{entity, default_addr});
|
||||
}
|
||||
|
||||
lbValue ptr = lb_find_value_from_entity(p->module, entity);
|
||||
lbAddr local_addr = lb_addr(ptr);
|
||||
|
||||
if (default_module != p->module) {
|
||||
string_map_set(&p->module->objc_classes, name, entity);
|
||||
string_map_set(&p->module->objc_classes, name, lbObjcRef{entity, local_addr});
|
||||
}
|
||||
|
||||
return local_addr;
|
||||
|
||||
Reference in New Issue
Block a user