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.

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

[DRAFT] Refactor marshaling code into legacy and non-legacy #68004

Closed
wants to merge 27 commits into from
Closed
Changes from 11 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9f27645
Split marshal into marshal, marshal-legacy.
Mar 7, 2022
61363c9
Factored shared parts into seperate file.
Apr 6, 2022
b3b831c
Added legacy-noilgen
Apr 8, 2022
cb0559b
Remove now redundant code from marshal-ilgen
Apr 13, 2022
3cefdfe
Added static
Apr 14, 2022
ff951f3
Removed unused variable cb_inited
Apr 14, 2022
6364c30
Removed unused variable sh_dangerous_release
Apr 14, 2022
80d6a1d
Incorporated changes to mono_marshal_shared_conv_to_icall
Apr 14, 2022
2931ce0
Removed redundant copy of emit_object_to_ptr_conv
Apr 14, 2022
e768c03
Removed redeclarations.
Apr 14, 2022
f9d4ff3
Removed more redeclarations.
Apr 14, 2022
380c70c
Put #ifdef ENABLE_ILGEILGEN around mono_marshal_ilgen_legacy_init (void)
Apr 15, 2022
102a123
Removed copy for marshal-legacy.
Apr 15, 2022
03c4f5f
Added ifdef around mono_marshal_ilgen_legacy_init
Apr 15, 2022
629a3fa
Remvoed redundant emit_struct_conv.
Apr 18, 2022
197c567
Added back missing klass.
Apr 21, 2022
5d7f758
Added missing block.
Apr 21, 2022
b4d6caa
Deleted unneed block.
Apr 21, 2022
b827a54
Integrated change with indirect field access.
Apr 22, 2022
7670dc3
Updated emit_marshal_custom_ilgen
Apr 22, 2022
3dc2274
Removed redundant get_method_nofail
Apr 22, 2022
3e477f0
Removed more redundant code. Recopied emit_marshal_object_ilgen
Apr 25, 2022
e9facc5
Recopied mono_marshal_shared_conv_to_icall
Apr 25, 2022
30eee10
Recopied emit_marshal_vtype_ilgen
Apr 25, 2022
c9c4153
Recopied mono_marshal_shared_emit_struct_conv_full
Apr 25, 2022
111254a
Recopied mono_marshal_shared_emit_object_to_ptr_conv
Apr 25, 2022
abaa746
Recopied emit_marshal_boolean_ilgen
Apr 25, 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
5 changes: 5 additions & 0 deletions src/mono/mono/metadata/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -91,8 +91,13 @@ set(metadata_common_sources
lock-tracer.h
marshal.c
marshal.h
marshal-legacy.c
Copy link
Member

Choose a reason for hiding this comment

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

I haven't started looking in detail yet, but I would have expected marshal-legacy.c to go into the ilgen_base_sources group (line 15-22)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I will make that change. I don't think I need a detailed review yet. I put it in draft mode while I work out some things I only saw in CI, but it doesn't seem to let me take your off as a reviewer.

marshal-legacy.h
marshal-legacy-noilgen.c
marshal-internals.h
marshal-noilgen.c
marshal-shared.h
marshal-shared.c
mempool.c
mempool.h
mempool-internals.h
Loading