Cleanup arm64 SeqPointInfo.

Commit migrated from https://github.com/mono/mono/commit/645c01066c08adef6d302a25d1ed9db6047e3042

diff --git a/src/mono/mono/metadata/object-offsets.h b/src/mono/mono/metadata/object-offsets.h
index 673e7ba..185028b 100644 (file)
--- a/src/mono/mono/metadata/object-offsets.h
+++ b/src/mono/mono/metadata/object-offsets.h
@@ -247,8 +247,6 @@ DECL_OFFSET (MonoContext, fregs)
 
 DECL_OFFSET(MonoLMF, lmf_addr)
 
-DECL_OFFSET(SeqPointInfo, ss_trigger_page)
-
 DECL_OFFSET(DynCallArgs, res)
 DECL_OFFSET(DynCallArgs, res2)
 #endif
@@ -260,6 +258,8 @@ DECL_OFFSET(GSharedVtCallInfo, vret_arg_reg)
 DECL_OFFSET(GSharedVtCallInfo, ret_marshal)
 DECL_OFFSET(GSharedVtCallInfo, vret_slot)
 DECL_OFFSET(GSharedVtCallInfo, gsharedvt_in)
+
+DECL_OFFSET(SeqPointInfo, ss_trigger_page)
 #endif
 
 #if defined(TARGET_ARM64)
@@ -277,9 +277,7 @@ DECL_OFFSET(SeqPointInfo, ss_tramp_addr)
 
 #if defined(TARGET_AMD64) || defined(TARGET_ARM) || defined(TARGET_ARM64)
 DECL_OFFSET(SeqPointInfo, bp_addrs)
-#endif
 
-#if defined(TARGET_AMD64) || defined(TARGET_ARM) || defined(TARGET_ARM64)
 DECL_OFFSET(CallContext, gregs)
 DECL_OFFSET(CallContext, fregs)
 DECL_OFFSET(CallContext, stack_size)

diff --git a/src/mono/mono/mini/aot-runtime.h b/src/mono/mono/mini/aot-runtime.h
index 0d07118..5a01eff 100644 (file)
--- a/src/mono/mono/mini/aot-runtime.h
+++ b/src/mono/mono/mini/aot-runtime.h
@@ -11,7 +11,7 @@
 #include "mini.h"
 
 /* Version number of the AOT file format */
-#define MONO_AOT_FILE_VERSION 169
+#define MONO_AOT_FILE_VERSION 170
 
 #define MONO_AOT_TRAMP_PAGE_SIZE 16384
 

diff --git a/src/mono/mono/mini/mini-arm64.h b/src/mono/mono/mini/mini-arm64.h
index b8fe591..e0c4014 100644 (file)
--- a/src/mono/mono/mini/mini-arm64.h
+++ b/src/mono/mono/mini/mini-arm64.h
@@ -79,8 +79,6 @@ struct MonoLMF {
 
 /* Structure used by the sequence points in AOTed code */
 struct SeqPointInfo {
-       gpointer ss_trigger_page;
-       gpointer bp_trigger_page;
        gpointer ss_tramp_addr;
        guint8* bp_addrs [MONO_ZERO_LEN_ARRAY];
 };