projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[llvm] Align aot variables to 8 bytes, parts of the aot code depend on it.
[mono.git]
/
mono
/
mini
/
aot-runtime.c
diff --git
a/mono/mini/aot-runtime.c
b/mono/mini/aot-runtime.c
index a93776da15a6b4f6a3a024ab68856eb9cfdb8044..a14c81811e2c80852d02a43a45cc015069b032ac 100644
(file)
--- a/
mono/mini/aot-runtime.c
+++ b/
mono/mini/aot-runtime.c
@@
-1969,6
+1969,7
@@
load_aot_module (MonoAssembly *assembly, gpointer user_data)
globals = (void **)info->globals;
g_assert (globals);
}
globals = (void **)info->globals;
g_assert (globals);
}
+ found_aot_name = g_strdup (aot_name);
} else {
char *err;
} else {
char *err;
@@
-3541,7
+3542,8
@@
decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
break;
}
case MONO_PATCH_INFO_INTERNAL_METHOD:
break;
}
case MONO_PATCH_INFO_INTERNAL_METHOD:
- case MONO_PATCH_INFO_JIT_ICALL_ADDR: {
+ case MONO_PATCH_INFO_JIT_ICALL_ADDR:
+ case MONO_PATCH_INFO_JIT_ICALL_ADDR_NOCALL: {
guint32 len = decode_value (p, &p);
ji->data.name = (char*)p;
guint32 len = decode_value (p, &p);
ji->data.name = (char*)p;