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

[MONO] Move Marshal-ilgen into a component #75542

Merged
merged 17 commits into from
Nov 15, 2022
Merged

[MONO] Move Marshal-ilgen into a component #75542

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
30bd957
Move marshal_ilgen into a component.
Jun 22, 2022
b8c83de
Incorporated race condition fix from main.
Nov 1, 2022
edb009e
Fix wasm syntax error.
Nov 1, 2022
c41cb19
Added missing include.
Nov 2, 2022
33e3e4e
Fix merge errors.
Nov 3, 2022
f759a75
Removed unused variable.
Nov 3, 2022
df7530a
Removed duplicate initilization.
Nov 3, 2022
139f366
Always enable ilgen.
Nov 14, 2022
792c919
Moved install_callbacks_mono
Nov 14, 2022
1124885
Stop copying marshal-ilgen.a
Nov 14, 2022
14cecf9
Remove remaining mentions of libmono-ilgen.a
Nov 15, 2022
f4dd8b0
Made ilgen_init_internal static.
Nov 15, 2022
a1a4379
Made emit_marshal_ilgen static.
Nov 15, 2022
e503e01
Made ilgen_install_callbacks_mono static
Nov 15, 2022
16a6816
Put method builder callbacks in a nested struct.
Nov 15, 2022
3085b9e
Moved mono_install_marshal_callbacks_ilgen to marshal-ilgen-internals
Nov 15, 2022
b01b517
Added marshal-ilgen-internals.h
Nov 15, 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
6 changes: 3 additions & 3 deletions src/mono/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ set(CMAKE_CXX_FLAGS_CHECKED "")
set(CMAKE_EXE_LINKER_FLAGS_CHECKED "")
set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "")

# This is always enabled now, and we should go through the code to remove the case here it is not defined
set(ENABLE_ILGEN 1)
naricc marked this conversation as resolved.
Show resolved Hide resolved

if(NOT MONO_LIB_NAME)
set(MONO_LIB_NAME "monosgen-2.0")
endif()
Expand Down Expand Up @@ -75,9 +78,6 @@ set(DISABLE_COM 1)
if(ENABLE_INTERP_LIB)
set(DISABLE_INTERPRETER 1)
endif()
if(NOT DISABLE_INTERPRETER OR NOT DISABLE_JIT)
set(ENABLE_ILGEN 1)
endif()
if(NOT DISABLE_EVENTPIPE)
set(ENABLE_PERFTRACING 1)
endif()
Expand Down
4 changes: 4 additions & 0 deletions src/mono/mono/component/marshal-ilgen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
#include "metadata/marshal.h"
#include "mono/component/component.h"

#if !defined(ENABLE_ILGEN)
# error ENABLE_ILGEN is always required now
#endif

typedef struct MonoComponentMarshalILgen {
MonoComponent component;
void (*ilgen_init_internal) (void);
Expand Down