From 54ba521bfabbdd27e9299eb6a41d7bf85f87b1f9 Mon Sep 17 00:00:00 2001 From: zoltan Date: Tue, 17 Feb 2009 06:01:45 +0000 Subject: [PATCH] 2009-02-17 Zoltan Varga * aot-runtime.c (load_image): Revert the previous change, it causes an AOT test to fail. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@127098 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/mini/ChangeLog | 5 ++++- mono/mini/aot-runtime.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index c170c6a62..a202188bd 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,8 +1,11 @@ 2009-02-17 Zoltan Varga + * aot-runtime.c (load_image): Revert the previous change, it causes an AOT + test to fail. + * aot-runtime.c (find_extra_method_in_amodule): Add a cache for decoded methods refs. - + * aot-runtime.c (load_image): Pass our basedir to mono_assembly_load. * aot-compiler.c (emit_exception_debug_info): Bump the maximum size of diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c index 6d00c5e45..4bdffb6ea 100644 --- a/mono/mini/aot-runtime.c +++ b/mono/mini/aot-runtime.c @@ -202,7 +202,7 @@ load_image (MonoAotModule *module, int index) if (module->out_of_date) return NULL; - assembly = mono_assembly_load (&module->image_names [index], module->assembly->basedir, &status); + assembly = mono_assembly_load (&module->image_names [index], NULL, &status); if (!assembly) { mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is unusable because dependency %s is not found.\n", module->aot_name, module->image_names [index].name); module->out_of_date = TRUE; -- 2.11.4.GIT