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

[release/6.0-preview4] [metadata-update] Make a copy of the DIL when applying updates #52352

Closed
wants to merge 1 commit into from
Closed

[release/6.0-preview4] [metadata-update] Make a copy of the DIL when applying updates #52352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions src/mono/mono/metadata/metadata-update.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,17 @@ mono_image_open_dmeta_from_data (MonoImage *base_image, uint32_t generation, gco
return dmeta_image;
}

static gpointer
open_dil_data (MonoImage *base_image G_GNUC_UNUSED, gconstpointer dil_src, uint32_t dil_length)
{
/* TODO: find a better memory manager. But this way we at least won't lose the IL data. */
MonoMemoryManager *mem_manager = (MonoMemoryManager *)mono_alc_get_default ()->memory_manager;

gpointer dil_copy = mono_mem_manager_alloc (mem_manager, dil_length);
memcpy (dil_copy, dil_src, dil_length);
return dil_copy;
}

static const char *
scope_to_string (uint32_t tok)
{
Expand Down Expand Up @@ -1017,7 +1028,7 @@ apply_enclog_pass2 (MonoImage *image_base, uint32_t generation, MonoImage *image
* LOCKING: Takes the publish_lock
*/
void
mono_image_load_enc_delta (MonoImage *image_base, gconstpointer dmeta_bytes, uint32_t dmeta_length, gconstpointer dil_bytes, uint32_t dil_length, MonoError *error)
mono_image_load_enc_delta (MonoImage *image_base, gconstpointer dmeta_bytes, uint32_t dmeta_length, gconstpointer dil_bytes_orig, uint32_t dil_length, MonoError *error)
{
mono_metadata_update_ee_init (error);
if (!is_ok (error))
Expand All @@ -1029,16 +1040,12 @@ mono_image_load_enc_delta (MonoImage *image_base, gconstpointer dmeta_bytes, uin
}

const char *basename = image_base->filename;
/* FIXME:
* (1) do we need to memcpy dmeta_bytes ? (maybe)
* (2) do we need to memcpy dil_bytes ? (pretty sure, yes)
*/

if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_METADATA_UPDATE)) {
g_print ("LOADING basename=%s delta update.\ndelta image=%p & dil=%p\n", basename, dmeta_bytes, dil_bytes);
g_print ("LOADING basename=%s delta update.\ndelta image=%p & dil=%p\n", basename, dmeta_bytes, dil_bytes_orig);
/* TODO: add a non-async version of mono_dump_mem */
mono_dump_mem (dmeta_bytes, dmeta_length);
mono_dump_mem (dil_bytes, dil_length);
mono_dump_mem (dil_bytes_orig, dil_length);
}

uint32_t generation = mono_metadata_update_prepare ();
Expand All @@ -1049,6 +1056,7 @@ mono_image_load_enc_delta (MonoImage *image_base, gconstpointer dmeta_bytes, uin
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_METADATA_UPDATE, "base image blob heap size: 0x%08x", image_base->heap_blob.size);

MonoImageOpenStatus status;
/* makes a copy of dmeta_bytes */
MonoImage *image_dmeta = mono_image_open_dmeta_from_data (image_base, generation, dmeta_bytes, dmeta_length, &status);
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_METADATA_UPDATE, "delta image string size: 0x%08x", image_dmeta->heap_strings.size);
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_METADATA_UPDATE, "delta image user string size: 0x%08x", image_dmeta->heap_us.size);
Expand All @@ -1057,6 +1065,10 @@ mono_image_load_enc_delta (MonoImage *image_base, gconstpointer dmeta_bytes, uin
g_assert (image_dmeta);
g_assert (status == MONO_IMAGE_OK);

/* makes a copy of dil_bytes_orig */
gpointer dil_bytes = open_dil_data (image_base, dil_bytes_orig, dil_length);
/* TODO: make a copy of the dpdb bytes, once we consume them */

if (image_dmeta->minimal_delta) {
guint32 idx = mono_metadata_decode_row_col (&image_dmeta->tables [MONO_TABLE_MODULE], 0, MONO_MODULE_NAME);

Expand Down