Update AOT after changes to SeqPoint in 488888ce612491aca1c97f79ddbad685302d43cc.

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 3bcac88ada2392a65fd497e1b483766c82e9c565..f82f6f558097f719fe007a5ef7ff87d3e920fe4f 100755 (executable)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -5397,6 +5397,7 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg)
                        last_il_offset = il_offset;
                        last_native_offset = native_offset;
 
+                       encode_value (sp->flags, p, &p);
                        encode_value (sp->next_len, p, &p);
                        for (j = 0; j < sp->next_len; ++j)
                                encode_value (sp->next [j], p, &p);

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 4f99f930b16120b85e04d641361be6fd095750ae..e4a05a44d33c5b7d973010ca0d15537fcf0a9688 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -2599,6 +2599,7 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
                        sp->il_offset = il_offset;
                        sp->native_offset = native_offset;
                        
+                       sp->flags = decode_value (p, &p);
                        sp->next_len = decode_value (p, &p);
                        sp->next = g_new (int, sp->next_len);
                        for (j = 0; j < sp->next_len; ++j)

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index ab56869dd90d7bd980cd37faad018b0c68672303..627cb2ae49e498caad8d072547424e80b0eeb510 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -133,7 +133,7 @@
 #endif
 
 /* Version number of the AOT file format */
-#define MONO_AOT_FILE_VERSION 94
+#define MONO_AOT_FILE_VERSION 95
 
 //TODO: This is x86/amd64 specific.
 #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6))