[mono][aot] Fix some memory leaks.#98147

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
vargaz merged 1 commit into from
Feb 8, 2024
Merged

[mono][aot] Fix some memory leaks. #98147

Show file tree
Hide file tree
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
42 changes: 26 additions & 16 deletions src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
if (synchronized) {
/* Avoid duplicate symbols because we don't cache */
char *tmp_symbol = res->symbol;
res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
if (res->debug_sym)
g_free (tmp_symbol);
if (res->debug_sym) {
char *tmp_debug_sym = res->debug_sym;
res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
g_free (tmp_debug_sym);
}
synchronized_symbol_idx ++;
}

if (res->debug_sym)
res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
else
res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
/* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
char *tmp = res->llvm_symbol;
res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
g_free (tmp);
}
res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
* sanitize_symbol:
*
* Return a modified version of S which only includes characters permissible in symbols.
* Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
*/
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
}
}

res = mono_mempool_strdup (acfg->mempool, gs->str);
res = g_strdup (gs->str);
g_string_free (gs, TRUE);
return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

g_free (prefix);

return sanitize_symbol (acfg, debug_sym);
char *tmp_debug_sym = debug_sym;
debug_sym = sanitize_symbol (acfg, debug_sym);
if (tmp_debug_sym != debug_sym)
g_free (tmp_debug_sym);

return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
}
}

if (llvm_acfg->aot_opts.static_link)
if (llvm_acfg->aot_opts.static_link) {
/* Include the assembly name too to avoid duplicate symbol errors */
return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
else
char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
g_free (tmp_debug_sym);
return debug_sym;
} else {
return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
} else {
cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
}
cfg->asm_debug_symbol = cfg->asm_symbol;
cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
}
}

Expand Down
6 changes: 5 additions & 1 deletion src/mono/mono/mini/mini.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
cfg->headers_to_free = NULL;

if (cfg->mempool) {
//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
mono_mempool_destroy (cfg->mempool);
cfg->mempool = NULL;
}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

mono_debug_free_method (cfg);

g_free (cfg->asm_symbol);
g_free (cfg->asm_debug_symbol);
g_free (cfg->llvm_method_name);

g_free (cfg->varinfo);
g_free (cfg->vars);
g_free (cfg->exception_message);
Expand Down
7 changes: 5 additions & 2 deletions src/mono/mono/mini/seq-points.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
jit_mm_lock (jit_mm);
// FIXME: The lookup can fail if the method is JITted recursively though a type cctor
if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
MonoSeqPointInfo *existing_seq_points = NULL;
if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
else
} else {
mono_seq_point_info_free (cfg->seq_point_info);
cfg->seq_point_info = existing_seq_points;
}
jit_mm_unlock (jit_mm);

g_assert (jinfo);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[mono][aot] Fix some memory leaks.#98147

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

vargaz
merged 1 commit into

from

Feb 8, 2024
 Merged


[mono][aot] Fix some memory leaks.
#98147
Show file tree
Hide file tree
 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


42 changes: 26 additions & 16 deletions
src/mono/mono/mini/aot-compiler.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
 if (synchronized) {
 /* Avoid duplicate symbols because we don't cache */
 char *tmp_symbol = res->symbol;
 res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
 if (res->debug_sym)
 g_free (tmp_symbol);
 if (res->debug_sym) {
 char *tmp_debug_sym = res->debug_sym;
 res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
 g_free (tmp_debug_sym);
 }
 synchronized_symbol_idx ++;
 }

 if (res->debug_sym)
 res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
 else
 res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
 /* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
 char *tmp = res->llvm_symbol;
 res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
 g_free (tmp);
 }
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
 res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

 g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
 * sanitize_symbol:
 *
 * Return a modified version of S which only includes characters permissible in symbols.
 * Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
 */
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
 }
	}

	res = mono_mempool_strdup (acfg->mempool, gs->str);
	res = g_strdup (gs->str);
	g_string_free (gs, TRUE);
	return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

	g_free (prefix);

	return sanitize_symbol (acfg, debug_sym);
	char *tmp_debug_sym = debug_sym;
	debug_sym = sanitize_symbol (acfg, debug_sym);
	if (tmp_debug_sym != debug_sym)
 g_free (tmp_debug_sym);

	return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
 }
	}

	if (llvm_acfg->aot_opts.static_link)
	if (llvm_acfg->aot_opts.static_link) {
 /* Include the assembly name too to avoid duplicate symbol errors */
 return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
	else
 char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
 char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
 g_free (tmp_debug_sym);
 return debug_sym;
	} else {
 return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
	}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
 } else {
 cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
 }
 cfg->asm_debug_symbol = cfg->asm_symbol;
 cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
 }
	}

Expand Down

6 changes: 5 additions & 1 deletion
src/mono/mono/mini/mini.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
	cfg->headers_to_free = NULL;

	if (cfg->mempool) {
	//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
 mono_mempool_destroy (cfg->mempool);
 cfg->mempool = NULL;
	}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

	mono_debug_free_method (cfg);

	g_free (cfg->asm_symbol);
	g_free (cfg->asm_debug_symbol);
	g_free (cfg->llvm_method_name);

	g_free (cfg->varinfo);
	g_free (cfg->vars);
	g_free (cfg->exception_message);
Expand Down

7 changes: 5 additions & 2 deletions
src/mono/mono/mini/seq-points.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
 MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
 jit_mm_lock (jit_mm);
 // FIXME: The lookup can fail if the method is JITted recursively though a type cctor
 if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
 MonoSeqPointInfo *existing_seq_points = NULL;
 if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
 g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
 else
} else {
 mono_seq_point_info_free (cfg->seq_point_info);
 cfg->seq_point_info = existing_seq_points;
 }
 jit_mm_unlock (jit_mm);

 g_assert (jinfo);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][aot] Fix some memory leaks.#98147

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

vargaz
merged 1 commit into

from

Feb 8, 2024
 Merged


[mono][aot] Fix some memory leaks.
#98147
Show file tree
Hide file tree
 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


42 changes: 26 additions & 16 deletions
src/mono/mono/mini/aot-compiler.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
 if (synchronized) {
 /* Avoid duplicate symbols because we don't cache */
 char *tmp_symbol = res->symbol;
 res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
 if (res->debug_sym)
 g_free (tmp_symbol);
 if (res->debug_sym) {
 char *tmp_debug_sym = res->debug_sym;
 res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
 g_free (tmp_debug_sym);
 }
 synchronized_symbol_idx ++;
 }

 if (res->debug_sym)
 res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
 else
 res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
 /* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
 char *tmp = res->llvm_symbol;
 res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
 g_free (tmp);
 }
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
 res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

 g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
 * sanitize_symbol:
 *
 * Return a modified version of S which only includes characters permissible in symbols.
 * Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
 */
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
 }
	}

	res = mono_mempool_strdup (acfg->mempool, gs->str);
	res = g_strdup (gs->str);
	g_string_free (gs, TRUE);
	return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

	g_free (prefix);

	return sanitize_symbol (acfg, debug_sym);
	char *tmp_debug_sym = debug_sym;
	debug_sym = sanitize_symbol (acfg, debug_sym);
	if (tmp_debug_sym != debug_sym)
 g_free (tmp_debug_sym);

	return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
 }
	}

	if (llvm_acfg->aot_opts.static_link)
	if (llvm_acfg->aot_opts.static_link) {
 /* Include the assembly name too to avoid duplicate symbol errors */
 return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
	else
 char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
 char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
 g_free (tmp_debug_sym);
 return debug_sym;
	} else {
 return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
	}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
 } else {
 cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
 }
 cfg->asm_debug_symbol = cfg->asm_symbol;
 cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
 }
	}

Expand Down

6 changes: 5 additions & 1 deletion
src/mono/mono/mini/mini.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
	cfg->headers_to_free = NULL;

	if (cfg->mempool) {
	//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
 mono_mempool_destroy (cfg->mempool);
 cfg->mempool = NULL;
	}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

	mono_debug_free_method (cfg);

	g_free (cfg->asm_symbol);
	g_free (cfg->asm_debug_symbol);
	g_free (cfg->llvm_method_name);

	g_free (cfg->varinfo);
	g_free (cfg->vars);
	g_free (cfg->exception_message);
Expand Down

7 changes: 5 additions & 2 deletions
src/mono/mono/mini/seq-points.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
 MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
 jit_mm_lock (jit_mm);
 // FIXME: The lookup can fail if the method is JITted recursively though a type cctor
 if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
 MonoSeqPointInfo *existing_seq_points = NULL;
 if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
 g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
 else
} else {
 mono_seq_point_info_free (cfg->seq_point_info);
 cfg->seq_point_info = existing_seq_points;
 }
 jit_mm_unlock (jit_mm);

 g_assert (jinfo);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][aot] Fix some memory leaks.#98147

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

vargaz
merged 1 commit into

from

Feb 8, 2024
 Merged


[mono][aot] Fix some memory leaks.
#98147
Show file tree
Hide file tree
 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


42 changes: 26 additions & 16 deletions
src/mono/mono/mini/aot-compiler.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
 if (synchronized) {
 /* Avoid duplicate symbols because we don't cache */
 char *tmp_symbol = res->symbol;
 res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
 if (res->debug_sym)
 g_free (tmp_symbol);
 if (res->debug_sym) {
 char *tmp_debug_sym = res->debug_sym;
 res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
 g_free (tmp_debug_sym);
 }
 synchronized_symbol_idx ++;
 }

 if (res->debug_sym)
 res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
 else
 res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
 /* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
 char *tmp = res->llvm_symbol;
 res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
 g_free (tmp);
 }
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
 res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

 g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
 * sanitize_symbol:
 *
 * Return a modified version of S which only includes characters permissible in symbols.
 * Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
 */
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
 }
	}

	res = mono_mempool_strdup (acfg->mempool, gs->str);
	res = g_strdup (gs->str);
	g_string_free (gs, TRUE);
	return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

	g_free (prefix);

	return sanitize_symbol (acfg, debug_sym);
	char *tmp_debug_sym = debug_sym;
	debug_sym = sanitize_symbol (acfg, debug_sym);
	if (tmp_debug_sym != debug_sym)
 g_free (tmp_debug_sym);

	return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
 }
	}

	if (llvm_acfg->aot_opts.static_link)
	if (llvm_acfg->aot_opts.static_link) {
 /* Include the assembly name too to avoid duplicate symbol errors */
 return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
	else
 char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
 char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
 g_free (tmp_debug_sym);
 return debug_sym;
	} else {
 return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
	}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
 } else {
 cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
 }
 cfg->asm_debug_symbol = cfg->asm_symbol;
 cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
 }
	}

Expand Down

6 changes: 5 additions & 1 deletion
src/mono/mono/mini/mini.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
	cfg->headers_to_free = NULL;

	if (cfg->mempool) {
	//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
 mono_mempool_destroy (cfg->mempool);
 cfg->mempool = NULL;
	}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

	mono_debug_free_method (cfg);

	g_free (cfg->asm_symbol);
	g_free (cfg->asm_debug_symbol);
	g_free (cfg->llvm_method_name);

	g_free (cfg->varinfo);
	g_free (cfg->vars);
	g_free (cfg->exception_message);
Expand Down

7 changes: 5 additions & 2 deletions
src/mono/mono/mini/seq-points.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
 MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
 jit_mm_lock (jit_mm);
 // FIXME: The lookup can fail if the method is JITted recursively though a type cctor
 if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
 MonoSeqPointInfo *existing_seq_points = NULL;
 if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
 g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
 else
} else {
 mono_seq_point_info_free (cfg->seq_point_info);
 cfg->seq_point_info = existing_seq_points;
 }
 jit_mm_unlock (jit_mm);

 g_assert (jinfo);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[mono][aot] Fix some memory leaks.#98147

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

vargaz
merged 1 commit into

from

Feb 8, 2024
 Merged


[mono][aot] Fix some memory leaks.
#98147
Show file tree
Hide file tree
 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


42 changes: 26 additions & 16 deletions
src/mono/mono/mini/aot-compiler.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
 if (synchronized) {
 /* Avoid duplicate symbols because we don't cache */
 char *tmp_symbol = res->symbol;
 res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
 if (res->debug_sym)
 g_free (tmp_symbol);
 if (res->debug_sym) {
 char *tmp_debug_sym = res->debug_sym;
 res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
 g_free (tmp_debug_sym);
 }
 synchronized_symbol_idx ++;
 }

 if (res->debug_sym)
 res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
 else
 res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
 /* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
 char *tmp = res->llvm_symbol;
 res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
 g_free (tmp);
 }
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
 res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

 g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
 * sanitize_symbol:
 *
 * Return a modified version of S which only includes characters permissible in symbols.
 * Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
 */
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
 }
	}

	res = mono_mempool_strdup (acfg->mempool, gs->str);
	res = g_strdup (gs->str);
	g_string_free (gs, TRUE);
	return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

	g_free (prefix);

	return sanitize_symbol (acfg, debug_sym);
	char *tmp_debug_sym = debug_sym;
	debug_sym = sanitize_symbol (acfg, debug_sym);
	if (tmp_debug_sym != debug_sym)
 g_free (tmp_debug_sym);

	return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
 }
	}

	if (llvm_acfg->aot_opts.static_link)
	if (llvm_acfg->aot_opts.static_link) {
 /* Include the assembly name too to avoid duplicate symbol errors */
 return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
	else
 char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
 char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
 g_free (tmp_debug_sym);
 return debug_sym;
	} else {
 return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
	}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
 } else {
 cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
 }
 cfg->asm_debug_symbol = cfg->asm_symbol;
 cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
 }
	}

Expand Down

6 changes: 5 additions & 1 deletion
src/mono/mono/mini/mini.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
	cfg->headers_to_free = NULL;

	if (cfg->mempool) {
	//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
 mono_mempool_destroy (cfg->mempool);
 cfg->mempool = NULL;
	}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

	mono_debug_free_method (cfg);

	g_free (cfg->asm_symbol);
	g_free (cfg->asm_debug_symbol);
	g_free (cfg->llvm_method_name);

	g_free (cfg->varinfo);
	g_free (cfg->vars);
	g_free (cfg->exception_message);
Expand Down

7 changes: 5 additions & 2 deletions
src/mono/mono/mini/seq-points.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
 MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
 jit_mm_lock (jit_mm);
 // FIXME: The lookup can fail if the method is JITted recursively though a type cctor
 if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
 MonoSeqPointInfo *existing_seq_points = NULL;
 if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
 g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
 else
} else {
 mono_seq_point_info_free (cfg->seq_point_info);
 cfg->seq_point_info = existing_seq_points;
 }
 jit_mm_unlock (jit_mm);

 g_assert (jinfo);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][aot] Fix some memory leaks.#98147

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

vargaz
merged 1 commit into

from

Feb 8, 2024
 Merged


[mono][aot] Fix some memory leaks.
#98147
Show file tree
Hide file tree
 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


42 changes: 26 additions & 16 deletions
src/mono/mono/mini/aot-compiler.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
 if (synchronized) {
 /* Avoid duplicate symbols because we don't cache */
 char *tmp_symbol = res->symbol;
 res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
 if (res->debug_sym)
 g_free (tmp_symbol);
 if (res->debug_sym) {
 char *tmp_debug_sym = res->debug_sym;
 res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
 g_free (tmp_debug_sym);
 }
 synchronized_symbol_idx ++;
 }

 if (res->debug_sym)
 res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
 else
 res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
 /* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
 char *tmp = res->llvm_symbol;
 res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
 g_free (tmp);
 }
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
 res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

 g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
 * sanitize_symbol:
 *
 * Return a modified version of S which only includes characters permissible in symbols.
 * Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
 */
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
 }
	}

	res = mono_mempool_strdup (acfg->mempool, gs->str);
	res = g_strdup (gs->str);
	g_string_free (gs, TRUE);
	return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

	g_free (prefix);

	return sanitize_symbol (acfg, debug_sym);
	char *tmp_debug_sym = debug_sym;
	debug_sym = sanitize_symbol (acfg, debug_sym);
	if (tmp_debug_sym != debug_sym)
 g_free (tmp_debug_sym);

	return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
 }
	}

	if (llvm_acfg->aot_opts.static_link)
	if (llvm_acfg->aot_opts.static_link) {
 /* Include the assembly name too to avoid duplicate symbol errors */
 return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
	else
 char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
 char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
 g_free (tmp_debug_sym);
 return debug_sym;
	} else {
 return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
	}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
 } else {
 cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
 }
 cfg->asm_debug_symbol = cfg->asm_symbol;
 cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
 }
	}

Expand Down

6 changes: 5 additions & 1 deletion
src/mono/mono/mini/mini.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
	cfg->headers_to_free = NULL;

	if (cfg->mempool) {
	//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
 mono_mempool_destroy (cfg->mempool);
 cfg->mempool = NULL;
	}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

	mono_debug_free_method (cfg);

	g_free (cfg->asm_symbol);
	g_free (cfg->asm_debug_symbol);
	g_free (cfg->llvm_method_name);

	g_free (cfg->varinfo);
	g_free (cfg->vars);
	g_free (cfg->exception_message);
Expand Down

7 changes: 5 additions & 2 deletions
src/mono/mono/mini/seq-points.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
 MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
 jit_mm_lock (jit_mm);
 // FIXME: The lookup can fail if the method is JITted recursively though a type cctor
 if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
 MonoSeqPointInfo *existing_seq_points = NULL;
 if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
 g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
 else
} else {
 mono_seq_point_info_free (cfg->seq_point_info);
 cfg->seq_point_info = existing_seq_points;
 }
 jit_mm_unlock (jit_mm);

 g_assert (jinfo);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][aot] Fix some memory leaks.#98147

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

vargaz
merged 1 commit into

from

Feb 8, 2024
 Merged


[mono][aot] Fix some memory leaks.
#98147
Show file tree
Hide file tree
 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


42 changes: 26 additions & 16 deletions
src/mono/mono/mini/aot-compiler.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
 if (synchronized) {
 /* Avoid duplicate symbols because we don't cache */
 char *tmp_symbol = res->symbol;
 res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
 if (res->debug_sym)
 g_free (tmp_symbol);
 if (res->debug_sym) {
 char *tmp_debug_sym = res->debug_sym;
 res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
 g_free (tmp_debug_sym);
 }
 synchronized_symbol_idx ++;
 }

 if (res->debug_sym)
 res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
 else
 res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
 /* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
 char *tmp = res->llvm_symbol;
 res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
 g_free (tmp);
 }
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
 res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

 g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
 * sanitize_symbol:
 *
 * Return a modified version of S which only includes characters permissible in symbols.
 * Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
 */
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
 }
	}

	res = mono_mempool_strdup (acfg->mempool, gs->str);
	res = g_strdup (gs->str);
	g_string_free (gs, TRUE);
	return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

	g_free (prefix);

	return sanitize_symbol (acfg, debug_sym);
	char *tmp_debug_sym = debug_sym;
	debug_sym = sanitize_symbol (acfg, debug_sym);
	if (tmp_debug_sym != debug_sym)
 g_free (tmp_debug_sym);

	return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
 }
	}

	if (llvm_acfg->aot_opts.static_link)
	if (llvm_acfg->aot_opts.static_link) {
 /* Include the assembly name too to avoid duplicate symbol errors */
 return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
	else
 char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
 char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
 g_free (tmp_debug_sym);
 return debug_sym;
	} else {
 return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
	}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
 } else {
 cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
 }
 cfg->asm_debug_symbol = cfg->asm_symbol;
 cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
 }
	}

Expand Down

6 changes: 5 additions & 1 deletion
src/mono/mono/mini/mini.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
	cfg->headers_to_free = NULL;

	if (cfg->mempool) {
	//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
 mono_mempool_destroy (cfg->mempool);
 cfg->mempool = NULL;
	}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

	mono_debug_free_method (cfg);

	g_free (cfg->asm_symbol);
	g_free (cfg->asm_debug_symbol);
	g_free (cfg->llvm_method_name);

	g_free (cfg->varinfo);
	g_free (cfg->vars);
	g_free (cfg->exception_message);
Expand Down

7 changes: 5 additions & 2 deletions
src/mono/mono/mini/seq-points.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
 MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
 jit_mm_lock (jit_mm);
 // FIXME: The lookup can fail if the method is JITted recursively though a type cctor
 if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
 MonoSeqPointInfo *existing_seq_points = NULL;
 if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
 g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
 else
} else {
 mono_seq_point_info_free (cfg->seq_point_info);
 cfg->seq_point_info = existing_seq_points;
 }
 jit_mm_unlock (jit_mm);

 g_assert (jinfo);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[mono][aot] Fix some memory leaks.#98147

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

vargaz
merged 1 commit into

from

Feb 8, 2024
 Merged


[mono][aot] Fix some memory leaks.
#98147
Show file tree
Hide file tree
 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


42 changes: 26 additions & 16 deletions
src/mono/mono/mini/aot-compiler.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4212,22 +4212,23 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 res->debug_sym = get_plt_entry_debug_sym (acfg, res->ji, acfg->plt_entry_debug_sym_cache);
 if (synchronized) {
 /* Avoid duplicate symbols because we don't cache */
 char *tmp_symbol = res->symbol;
 res->symbol = g_strdup_printf ("%s_%d", res->symbol, synchronized_symbol_idx);
 if (res->debug_sym)
 g_free (tmp_symbol);
 if (res->debug_sym) {
 char *tmp_debug_sym = res->debug_sym;
 res->debug_sym = g_strdup_printf ("%s_%d", res->debug_sym, synchronized_symbol_idx);
 g_free (tmp_debug_sym);
 }
 synchronized_symbol_idx ++;
 }

 if (res->debug_sym)
 res->llvm_symbol = g_strdup_printf ("%s_%s_llvm", res->symbol, res->debug_sym);
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_%s_llvm", res->symbol, res->debug_sym);
 else
 res->llvm_symbol = g_strdup_printf ("%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol) {
 /* The llvm symbol shouldn't be temporary, since the llvm generated object file references it */
 char *tmp = res->llvm_symbol;
 res->llvm_symbol = g_strdup (res->llvm_symbol + strlen (acfg->temp_prefix));
 g_free (tmp);
 }
 res->llvm_symbol = mono_mempool_strdup_printf (acfg->mempool, "%s_llvm", res->symbol);
 if (strstr (res->llvm_symbol, acfg->temp_prefix) == res->llvm_symbol)
 res->llvm_symbol = res->llvm_symbol + strlen (acfg->temp_prefix);

 g_hash_table_insert (acfg->patch_to_plt_entry [new_ji->type], new_ji, res);

Expand DownExpand Up@@ -7003,7 +7004,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
/*
 * sanitize_symbol:
 *
 * Return a modified version of S which only includes characters permissible in symbols.
 * Returns either S or a malloc-ed modified version of S which only includes characters permissible in symbols.
 */
static char*
sanitize_symbol (MonoAotCompile *acfg, char *s)
Expand DownExpand Up@@ -7045,7 +7046,7 @@ sanitize_symbol (MonoAotCompile *acfg, char *s)
 }
	}

	res = mono_mempool_strdup (acfg->mempool, gs->str);
	res = g_strdup (gs->str);
	g_string_free (gs, TRUE);
	return res;
}
Expand DownExpand Up@@ -8039,7 +8040,12 @@ get_plt_entry_debug_sym (MonoAotCompile *acfg, MonoJumpInfo *ji, GHashTable *cac

	g_free (prefix);

	return sanitize_symbol (acfg, debug_sym);
	char *tmp_debug_sym = debug_sym;
	debug_sym = sanitize_symbol (acfg, debug_sym);
	if (tmp_debug_sym != debug_sym)
 g_free (tmp_debug_sym);

	return debug_sym;
}

/*
Expand DownExpand Up@@ -9863,11 +9869,15 @@ mono_aot_get_method_name (MonoCompile *cfg)
 }
	}

	if (llvm_acfg->aot_opts.static_link)
	if (llvm_acfg->aot_opts.static_link) {
 /* Include the assembly name too to avoid duplicate symbol errors */
 return g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash));
	else
 char *tmp_debug_sym = get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
 char *debug_sym = g_strdup_printf ("%s_%s", llvm_acfg->assembly_name_sym, tmp_debug_sym);
 g_free (tmp_debug_sym);
 return debug_sym;
	} else {
 return get_debug_sym (cfg->orig_method, "", llvm_acfg->method_label_hash);
	}
}

static gboolean
Expand DownExpand Up@@ -15372,7 +15382,7 @@ emit_aot_image (MonoAotCompile *acfg)
 } else {
 cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
 }
 cfg->asm_debug_symbol = cfg->asm_symbol;
 cfg->asm_debug_symbol = g_strdup (cfg->asm_symbol);
 }
	}

Expand Down

6 changes: 5 additions & 1 deletion
src/mono/mono/mini/mini.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1756,7 +1756,7 @@ mono_empty_compile (MonoCompile *cfg)
	cfg->headers_to_free = NULL;

	if (cfg->mempool) {
	//mono_mempool_stats (cfg->mempool);
//mono_mempool_stats (cfg->mempool);
 mono_mempool_destroy (cfg->mempool);
 cfg->mempool = NULL;
	}
Expand DownExpand Up@@ -1788,6 +1788,10 @@ mono_destroy_compile (MonoCompile *cfg)

	mono_debug_free_method (cfg);

	g_free (cfg->asm_symbol);
	g_free (cfg->asm_debug_symbol);
	g_free (cfg->llvm_method_name);

	g_free (cfg->varinfo);
	g_free (cfg->vars);
	g_free (cfg->exception_message);
Expand Down

7 changes: 5 additions & 2 deletions
src/mono/mono/mini/seq-points.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,10 +238,13 @@ mono_save_seq_point_info (MonoCompile *cfg, MonoJitInfo *jinfo)
 MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
 jit_mm_lock (jit_mm);
 // FIXME: The lookup can fail if the method is JITted recursively though a type cctor
 if (!g_hash_table_lookup (jit_mm->seq_points, cfg->method_to_register))
 MonoSeqPointInfo *existing_seq_points = NULL;
 if (!g_hash_table_lookup_extended (jit_mm->seq_points, cfg->method_to_register, NULL, (gpointer *)&existing_seq_points)) {
 g_hash_table_insert (jit_mm->seq_points, cfg->method_to_register, cfg->seq_point_info);
 else
} else {
 mono_seq_point_info_free (cfg->seq_point_info);
 cfg->seq_point_info = existing_seq_points;
 }
 jit_mm_unlock (jit_mm);

 g_assert (jinfo);
Expand Down