Skip to content
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

Jump to bottom

[wasm] Remove dependency on definition of MonoClass #87077

Merged
merged 5 commits into from
Jun 3, 2023
Merged

[wasm] Remove dependency on definition of MonoClass #87077

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1a008b
Remove dependency on definition of MonoClass
kg Jun 2, 2023
54764be
Better approach to getting class offsets
kg Jun 2, 2023
d3d8168
Take 3
kg Jun 2, 2023
e9b3b06
Take 4
kg Jun 2, 2023
1604fd1
Repair merge damage
kg Jun 2, 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
5 changes: 3 additions & 2 deletions src/mono/mono/mini/interp/jiterpreter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ void jiterp_preserve_module (void);
#include <mono/metadata/mono-config.h>
#include <mono/utils/mono-threads.h>
#include <mono/metadata/gc-internals.h>
#include <mono/metadata/class-abi-details.h>

#include "interp.h"
#include "interp-internals.h"
Expand Down Expand Up @@ -1171,9 +1172,9 @@ mono_jiterp_get_member_offset (int member) {
case JITERP_MEMBER_VTABLE_KLASS:
return offsetof (MonoVTable, klass);
case JITERP_MEMBER_CLASS_RANK:
return offsetof (MonoClass, rank);
return m_class_offsetof_rank();
case JITERP_MEMBER_CLASS_ELEMENT_CLASS:
return offsetof (MonoClass, element_class);
return m_class_offsetof_element_class();
// see mono_object_get_data
case JITERP_MEMBER_BOXED_VALUE_DATA:
return MONO_ABI_SIZEOF (MonoObject);
Expand Down