projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
78ec764
)
[netcore] Avoid calling load hooks during AOT.
author
Zoltan Varga
<vargaz@gmail.com>
Tue, 6 Aug 2019 13:49:28 +0000
(09:49 -0400)
committer
Marek Safar
<marek.safar@gmail.com>
Tue, 6 Aug 2019 17:40:23 +0000
(19:40 +0200)
Fixes https://github.com/mono/mono/issues/16046.
Commit migrated from https://github.com/mono/mono/commit/
3c88e9f251684c46ca07286a9637a2e5266eec15
src/mono/mono/metadata/assembly-load-context.c
patch
|
blob
|
history
diff --git
a/src/mono/mono/metadata/assembly-load-context.c
b/src/mono/mono/metadata/assembly-load-context.c
index
e33ba7f
..
8eb8bbb
100644
(file)
--- a/
src/mono/mono/metadata/assembly-load-context.c
+++ b/
src/mono/mono/metadata/assembly-load-context.c
@@
-118,6
+118,10
@@
invoke_resolve_method (MonoMethod *resolve_method, MonoAssemblyLoadContext *alc,
{
MonoAssembly *result = NULL;
char* aname_str = NULL;
+
+ if (mono_runtime_get_no_exec ())
+ return NULL;
+
HANDLE_FUNCTION_ENTER ();
aname_str = mono_stringify_assembly_name (aname);