Fix a problem in the last banch of AOT optimizations

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index d5eb9f0fab49e9ec99ac3300af81712ce0427d16..e80ee0de5c7ccd8f6ad8ac3f471340111a81decf 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -652,6 +652,7 @@ fullaotcheck: mono $(regtests)
        cp $(CLASS)/mscorlib.dll $(CLASS)/System.Core.dll $(CLASS)/System.dll $(CLASS)/Mono.Posix.dll $(CLASS)/System.Configuration.dll $(CLASS)/System.Security.dll $(CLASS)/System.Xml.dll $(CLASS)/Mono.Security.dll $(CLASS)/Mono.Simd.dll $(regtests) generics-variant-types.dll TestDriver.dll fullaot-tmp/
        cp $(regtests) fullaot-tmp/
        MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(LLVM_AOT_RUNTIME_OPTS) --aot=full fullaot-tmp/* || exit 1
+       ln -s $$PWD/mono fullaot-tmp/
        for i in $(regtests); do echo $$i; MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper --full-aot fullaot-tmp/$$i --exclude '!FULLAOT' || exit 1; done
 
 llvmfullaotcheck:

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 9764af78f7da793966c5ea89149c7bc9d064e15d..ac7ea2086f2c71373cb5e4485d23d37ff53ebd71 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -390,7 +390,7 @@ decode_klass_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
                break;
        case MONO_AOT_TYPEREF_TYPESPEC_TOKEN:
                token = decode_value (p, &p);
-               image = load_image (module, 0, TRUE);
+               image = module->assembly->image;
                if (!image)
                        return NULL;
                klass = mono_class_get (image, token);