Skip to content

[mono] Fix warnings with recent clang/gcc #62244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 2 commits into from
Dec 2, 2021
Merged

[mono] Fix warnings with recent clang/gcc #62244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b5d13
[mono] Fix warnings with recent clang/gcc
akoeplinger Dec 1, 2021
c5b78ec
Apply suggestions from code review
akoeplinger Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/mono/mono/component/hot_reload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,8 +1545,8 @@ apply_enclog_pass2 (MonoImage *image_base, BaselineInfo *base_info, uint32_t gen
*/


MonoClass *add_method_klass = NULL;
#ifdef ALLOW_METHOD_ADD
MonoClass *add_method_klass = NULL;
uint32_t add_param_method_index = 0;
#endif

Expand Down Expand Up @@ -1666,7 +1666,9 @@ apply_enclog_pass2 (MonoImage *image_base, BaselineInfo *base_info, uint32_t gen
/* rva points probably into image_base IL stream. can this ever happen? */
g_print ("TODO: this case is still a bit contrived. token=0x%08x with rva=0x%04x\n", log_token, rva);
}
#ifdef ALLOW_METHOD_ADD
add_method_klass = NULL;
#endif
break;
}
case MONO_TABLE_TYPEDEF: {
Expand Down Expand Up @@ -1941,7 +1943,6 @@ hot_reload_table_bounds_check (MonoImage *base_image, int table_index, int token
g_assert (base_info);

GList *list = base_info->delta_info;
MonoImage *dmeta;
MonoTableInfo *table;
/* result row, 0-based */
int ridx;
Expand All @@ -1952,7 +1953,6 @@ hot_reload_table_bounds_check (MonoImage *base_image, int table_index, int token
return TRUE;
DeltaInfo *delta_info = (DeltaInfo*)list->data;
g_assert (delta_info);
dmeta = delta_info->delta_image;
if (delta_info->generation > exposed_gen)
return TRUE;
list = list->next;
Expand Down
20 changes: 12 additions & 8 deletions src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6697,23 +6697,27 @@ emit_method_code (MonoAotCompile *acfg, MonoCompile *cfg)
* - it allows the setting of breakpoints of aot-ed methods.
*/

// Comment out to force dedup to link these symbols and forbid compiling
// Enable to force dedup to link these symbols and forbid compiling
// in duplicated code. This is an "assert when linking if broken" trick.
/*if (mono_aot_can_dedup (method) && (acfg->aot_opts.dedup || acfg->aot_opts.dedup_include))*/
/*debug_sym = mono_aot_get_mangled_method_name (method);*/
/*else*/
#if 0
if (mono_aot_can_dedup (method) && (acfg->aot_opts.dedup || acfg->aot_opts.dedup_include))
debug_sym = mono_aot_get_mangled_method_name (method);
else
#endif
debug_sym = get_debug_sym (method, "", acfg->method_label_hash);

cfg->asm_debug_symbol = g_strdup (debug_sym);

if (acfg->need_no_dead_strip)
fprintf (acfg->fp, " .no_dead_strip %s\n", debug_sym);

// Comment out to force dedup to link these symbols and forbid compiling
// Enable to force dedup to link these symbols and forbid compiling
// in duplicated code. This is an "assert when linking if broken" trick.
/*if (mono_aot_can_dedup (method) && (acfg->aot_opts.dedup || acfg->aot_opts.dedup_include))*/
/*emit_global_inner (acfg, debug_sym, TRUE);*/
/*else*/
#if 0
if (mono_aot_can_dedup (method) && (acfg->aot_opts.dedup || acfg->aot_opts.dedup_include))
emit_global_inner (acfg, debug_sym, TRUE);
else
#endif
emit_local_symbol (acfg, debug_sym, symbol, TRUE);

emit_label (acfg, debug_sym);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/method-to-ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12136,7 +12136,7 @@ mono_ins_no_side_effects (MonoInst *ins)
if (mono_op_no_side_effects (ins->opcode))
return TRUE;
if (ins->opcode == OP_AOTCONST) {
MonoJumpInfoType type = (MonoJumpInfoType)ins->inst_p1;
MonoJumpInfoType type = (MonoJumpInfoType)(intptr_t)ins->inst_p1;
// Some AOTCONSTs have side effects
switch (type) {
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
Expand Down