Skip to content

[mono] Mark AOT modules unusable if no AOT version is found #106026

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
merged 2 commits into from
Aug 7, 2024
Merged

[mono] Mark AOT modules unusable if no AOT version is found #106026

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e00e87
mark AOT module unusable if no version found
matouskozak Aug 6, 2024
cf141d3
Update src/mono/mono/mini/aot-runtime.c
matouskozak Aug 6, 2024
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
11 changes: 6 additions & 5 deletions src/mono/mono/mini/aot-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,15 +2102,13 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer
find_symbol (sofile, globals, "mono_aot_file_info", (gpointer*)&info);
}

// Copy aotid to MonoImage
memcpy(&assembly->image->aotid, info->aotid, 16);

if (version_symbol) {
/* Old file format */
version = atoi (version_symbol);
} else {
g_assert (info);
} else if (info) {
version = info->version;
} else {
version = -1;
}

if (version != MONO_AOT_FILE_VERSION) {
Expand All @@ -2120,6 +2118,9 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer
guint8 *blob;
void *handle;

// Copy aotid to MonoImage
memcpy(&assembly->image->aotid, info->aotid, 16);

if (info->flags & MONO_AOT_FILE_FLAG_SEPARATE_DATA) {
aot_data = open_aot_data (assembly, info, &handle);

Expand Down