Skip to content

[MONO] Factor marshal-lightweight out of marshal-ilgen #69208

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
naricc merged 13 commits into from
May 28, 2022
Merged

[MONO] Factor marshal-lightweight out of marshal-ilgen #69208

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7252dde
Initial seperation into ilgen, lightweight.
May 9, 2022
3861b06
No-ilgen stuff.
May 11, 2022
add46b7
Spacing fixes.
May 11, 2022
7e04963
Added enable_ilgen flag around mono_marshal_ilgen_init
May 12, 2022
273b4e5
Moved driver to use lightweight init.
May 12, 2022
4f01ab1
Put guards around mono_marshal_lightweight_init
May 13, 2022
95ef239
added guard in mono_install_marshal_callbacks
May 13, 2022
b6e9de6
Fixed name of mono_marshal_lightweight_cb_is_inited
May 13, 2022
87f1e79
Fixed bug with double init.
May 14, 2022
cb7fd09
Fixed ifdefs around mono_marshal_noilgen_init_heavyweight/lightweight.
May 15, 2022
6a60e2b
Removed debug prints.
May 15, 2022
7447799
Added call to mono_marshal_ilgen_init from wasm driver.
May 20, 2022
344aa0b
Removed more debugging.
May 20, 2022
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
Prev Previous commit
Next Next commit
added guard in mono_install_marshal_callbacks
  • Loading branch information
Nathan Ricci committed May 25, 2022
commit 95ef2395496be8a3f98d2ebec4708766fd19504c
10 changes: 6 additions & 4 deletions src/mono/mono/metadata/marshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6180,10 +6180,12 @@ mono_install_marshal_callbacks (MonoMarshalLightweightCallbacks *cb)
mono_wasm_print_stack_trace ();
#endif

g_assert (!lightweight_cb_inited);
g_assert (cb->version == MONO_MARSHAL_CALLBACKS_VERSION);
memcpy (&marshal_lightweight_cb, cb, sizeof (MonoMarshalLightweightCallbacks));
lightweight_cb_inited = TRUE;
if(!lightweight_cb_inited) {
g_assert (!lightweight_cb_inited);
g_assert (cb->version == MONO_MARSHAL_CALLBACKS_VERSION);
memcpy (&marshal_lightweight_cb, cb, sizeof (MonoMarshalLightweightCallbacks));
lightweight_cb_inited = TRUE;
}
}

gboolean
Expand Down