Skip to content

Fix mono's Wsingle-bit-bitfield-constant-conversion #90068

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
merged 2 commits into from
Aug 6, 2023
Merged

Fix mono's Wsingle-bit-bitfield-constant-conversion #90068

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
99a29bd
Fix mono's Wsingle-bit-bitfield-constant-conversion
am11 Aug 5, 2023
4ca9d86
Address CR feedback
am11 Aug 6, 2023
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/metadata/class-internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ enum {
/* added by metadata-update after class was created;
* not in MonoClassEventInfo array - don't do ptr arithmetic */
MONO_EVENT_META_FLAG_FROM_UPDATE = 0x00010000,

MONO_EVENT_META_FLAG_MASK = 0x00010000,
};

Expand Down Expand Up @@ -504,11 +504,11 @@ struct _MonoGenericContainer {
int type_argc : 29; // Per the ECMA spec, this value is capped at 16 bits
/* If true, we're a generic method, otherwise a generic type definition. */
/* Invariant: parent != NULL => is_method */
int is_method : 1;
gint is_method : 1;
/* If true, this container has no associated class/method and only the image is known. This can happen:
1. For the special anonymous containers kept by MonoImage.
2. When user code creates a generic parameter via SRE, but has not yet set an owner. */
int is_anonymous : 1;
gint is_anonymous : 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 these still raise the warning in main, should this have been guint?

/__w/1/s/src/mono/mono/metadata/sre.c:1626:33: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion]
                          generic_container->is_method = TRUE;
                                                       ^ ~~~~
  /__w/1/s/src/mono/mono/metadata/sre.c:1631:36: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion]
                          generic_container->is_anonymous = TRUE;
                                                          ^ ~~~~

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#91314

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, yes guint is correct.

/* Our type parameters. If this is a special anonymous container (case 1, above), this field is not valid, use mono_metadata_create_anon_gparam () */
MonoGenericParamFull *type_params;
};
Expand Down
8 changes: 4 additions & 4 deletions src/mono/mono/metadata/image-internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
#include <mono/metadata/loader-internals.h>

typedef struct {
gboolean dont_care_about_cli : 1;
gboolean dont_care_about_pecoff : 1;
guint dont_care_about_cli : 1;
guint dont_care_about_pecoff : 1;
} MonoImageLoadOptions;

typedef struct {
MonoImageLoadOptions load_options;
int not_executable : 1;
int metadata_only : 1;
guint not_executable : 1;
guint metadata_only : 1;
} MonoImageOpenOptions;

MonoImage*
Expand Down
32 changes: 16 additions & 16 deletions src/mono/mono/metadata/jit-info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ typedef struct
MonoDwarfLocListEntry *locations;
gint32 this_offset;
guint8 this_reg;
gboolean has_this:1;
gboolean this_in_reg:1;
guint has_this:1;
guint this_in_reg:1;
} MonoGenericJitInfo;

/*
Expand Down Expand Up @@ -197,26 +197,26 @@ struct _MonoJitInfo {
guint32 unwind_info;
int code_size;
guint32 num_clauses:15;
gboolean has_generic_jit_info:1;
gboolean has_try_block_holes:1;
gboolean has_arch_eh_info:1;
gboolean has_thunk_info:1;
gboolean has_unwind_info:1;
gboolean from_aot:1;
gboolean from_llvm:1;
gboolean dbg_attrs_inited:1;
gboolean dbg_hidden:1;
guint has_generic_jit_info:1;
guint has_try_block_holes:1;
guint has_arch_eh_info:1;
guint has_thunk_info:1;
guint has_unwind_info:1;
guint from_aot:1;
guint from_llvm:1;
guint dbg_attrs_inited:1;
guint dbg_hidden:1;
/* Whenever this jit info was loaded in async context */
gboolean async:1;
gboolean dbg_step_through:1;
gboolean dbg_non_user_code:1;
guint async:1;
guint dbg_step_through:1;
guint dbg_non_user_code:1;
/*
* Whenever this jit info refers to a trampoline.
* d.tramp_info contains additional data in this case.
*/
gboolean is_trampoline:1;
guint is_trampoline:1;
/* Whenever this jit info refers to an interpreter method */
gboolean is_interp:1;
guint is_interp:1;

/* FIXME: Embed this after the structure later*/
gpointer gc_info; /* Currently only used by SGen */
Expand Down
26 changes: 13 additions & 13 deletions src/mono/mono/mini/interp/transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,18 @@ struct _InterpBasicBlock {
SeqPoint **pred_seq_points;
guint num_pred_seq_points;

int reachable : 1;
guint reachable : 1;
// This block has special semantics and it shouldn't be optimized away
int eh_block : 1;
int dead: 1;
guint eh_block : 1;
guint dead: 1;
// If patchpoint is set we will store mapping information between native offset and bblock index within
// InterpMethod. In the unoptimized method we will map from native offset to the bb_index while in the
// optimized method we will map the bb_index to the corresponding native offset.
int patchpoint_data: 1;
int emit_patchpoint: 1;
guint patchpoint_data: 1;
guint emit_patchpoint: 1;
// used by jiterpreter
int backwards_branch_target: 1;
int contains_call_instruction: 1;
guint backwards_branch_target: 1;
guint contains_call_instruction: 1;
};

struct _InterpCallInfo {
Expand Down Expand Up @@ -260,16 +260,16 @@ typedef struct
int inline_depth;
int patchpoint_data_n;
int *patchpoint_data;
int has_localloc : 1;
guint has_localloc : 1;
// If method compilation fails due to certain limits being exceeded, we disable inlining
// and retry compilation.
int disable_inlining : 1;
guint disable_inlining : 1;
// If the current method (inlined_method) has the aggressive inlining attribute, we no longer
// bail out of inlining when having to generate certain opcodes (like call, throw).
int aggressive_inlining : 1;
int optimized : 1;
int has_invalid_code : 1;
int has_inlined_one_call : 1;
guint aggressive_inlining : 1;
guint optimized : 1;
guint has_invalid_code : 1;
guint has_inlined_one_call : 1;
} TransformData;

#define STACK_TYPE_I4 0
Expand Down
6 changes: 3 additions & 3 deletions src/mono/mono/mini/mini.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,9 +1239,9 @@ typedef struct {
guint emulate_long_shift_opts : 1;
guint have_objc_get_selector : 1;
guint have_generalized_imt_trampoline : 1;
gboolean have_op_tailcall_membase : 1;
gboolean have_op_tailcall_reg : 1;
gboolean have_volatile_non_param_register : 1;
guint have_op_tailcall_membase : 1;
guint have_op_tailcall_reg : 1;
guint have_volatile_non_param_register : 1;
guint have_init_mrgctx : 1;
guint gshared_supported : 1;
guint ilp32 : 1;
Expand Down
10 changes: 5 additions & 5 deletions src/mono/mono/utils/mono-codeman.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,18 @@ struct _CodeChunk {
CodeChunk *next;
int pos;
int size;
unsigned int reserved: 8;
gint reserved: 8;
/* this number of bytes is available to resolve addresses far in memory */
unsigned int bsize: 24;
gint bsize: 24;
};

struct _MonoCodeManager {
CodeChunk *current;
CodeChunk *full;
CodeChunk *last;
int dynamic : 1;
int read_only : 1;
int no_exec : 1;
guint dynamic : 1;
guint read_only : 1;
guint no_exec : 1;
};

#define ALIGN_INT(val,alignment) (((val) + (alignment - 1)) & ~(alignment - 1))
Expand Down