Skip to content

Commit

Permalink
[metadata] make m_field_set_parent and m_field_set_meta_flags inline
Browse files Browse the repository at this point in the history
m_ prefix functions are supposed to be inline
  • Loading branch information
lambdageek committed Jan 18, 2022
1 parent 924c6e3 commit 0a56e88
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 19 deletions.
13 changes: 0 additions & 13 deletions src/mono/mono/metadata/class-init.c
Original file line number Diff line number Diff line change
Expand Up @@ -4086,16 +4086,3 @@ mono_classes_init (void)
mono_counters_register ("MonoClass size",
MONO_COUNTER_METADATA | MONO_COUNTER_INT, &classes_size);
}

void
m_field_set_parent (MonoClassField *field, MonoClass *klass)
{
uintptr_t old_flags = m_field_get_meta_flags (field);
field->parent_and_flags = ((uintptr_t)klass) | old_flags;
}

void
m_field_set_meta_flags (MonoClassField *field, unsigned int flags)
{
field->parent_and_flags |= (field->parent_and_flags & ~MONO_CLASS_FIELD_META_FLAG_MASK) | flags;
}
14 changes: 14 additions & 0 deletions src/mono/mono/metadata/class-inlines.h
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,18 @@ m_method_is_wrapper (MonoMethod *method)
return method->wrapper_type != 0;
}


static inline void
m_field_set_parent (MonoClassField *field, MonoClass *klass)
{
uintptr_t old_flags = m_field_get_meta_flags (field);
field->parent_and_flags = ((uintptr_t)klass) | old_flags;
}

static inline void
m_field_set_meta_flags (MonoClassField *field, unsigned int flags)
{
field->parent_and_flags |= (field->parent_and_flags & ~MONO_CLASS_FIELD_META_FLAG_MASK) | flags;
}

#endif
6 changes: 0 additions & 6 deletions src/mono/mono/metadata/class-internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -1587,12 +1587,6 @@ m_field_get_meta_flags (MonoClassField *field)
return (unsigned int)(field->parent_and_flags & MONO_CLASS_FIELD_META_FLAG_MASK);
}

MONO_COMPONENT_API void
m_field_set_parent (MonoClassField *field, MonoClass *klass);

MONO_COMPONENT_API void
m_field_set_meta_flags (MonoClassField *field, unsigned int flags);

static inline gboolean
m_field_get_offset (MonoClassField *field)
{
Expand Down

0 comments on commit 0a56e88

Please sign in to comment.