Skip to content

Commit

Permalink
dedup for iOS
Browse files Browse the repository at this point in the history
  • Loading branch information
kotlarmilos committed Dec 28, 2022
1 parent 5c9f306 commit d4fe498
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/mono/mono/mini/aot-compiler.c
Original file line number Diff line number Diff line change
Expand Up @@ -10459,9 +10459,6 @@ dedup_skip_methods (MonoAotCompile *acfg)
{
int i;

if (acfg->aot_opts.llvm_only)
return;

for (guint oindex = 0; oindex < acfg->method_order->len; ++oindex) {
MonoCompile *cfg;
MonoMethod *method;
Expand Down Expand Up @@ -10764,6 +10761,9 @@ emit_method_info_table (MonoAotCompile *acfg)
for (guint oindex = 0; oindex < acfg->method_order->len; ++oindex) {
i = GPOINTER_TO_UINT (g_ptr_array_index (acfg->method_order, oindex));

if (ignore_cfg (acfg->cfgs [i]))
continue;

if (acfg->cfgs [i]) {
emit_method_info (acfg, acfg->cfgs [i]);
offsets [i] = acfg->cfgs [i]->method_info_offset;
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/mini-llvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -11797,7 +11797,7 @@ mono_llvm_emit_method (MonoCompile *cfg)
* - the method needs to have a unique mangled name
* - llvmonly mode, since the code in aot-runtime.c would initialize got slots in the wrong aot image etc.
*/
if (ctx->module->llvm_only && ctx->module->static_link && is_linkonce_method (cfg->method))
if (ctx->module->static_link && is_linkonce_method (cfg->method))
is_linkonce = TRUE;
if (is_linkonce || mono_aot_is_externally_callable (cfg->method))
method_name = mono_aot_get_mangled_method_name (cfg->method);
Expand Down

0 comments on commit d4fe498

Please sign in to comment.