[jit] Remove the nursery_bits from the wrapper info for the gc write barrier methods...

diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h
index ff3c39ed251511f714e418a1baad5397dda8c095..29350e4d8461acd65ac7c286a2d00063d12c8fde 100644 (file)
--- a/mono/metadata/marshal.h
+++ b/mono/metadata/marshal.h
@@ -171,7 +171,6 @@ typedef struct {
 } ProxyWrapperInfo;
 
 typedef struct {
-       int nursery_bits;
 } WriteBarrierWrapperInfo;
 
 typedef struct {

diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c
index cd029baf23637fee580a02a9eae171236b981e50..2783e1af8fa6dd6967a4bc8312a2b4f2974ced7e 100644 (file)
--- a/mono/metadata/sgen-mono.c
+++ b/mono/metadata/sgen-mono.c
@@ -332,8 +332,6 @@ mono_gc_get_specific_write_barrier (gboolean is_concurrent)
 #endif
        res = mono_mb_create_method (mb, sig, 16);
        info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
-       /* The generated barrier depends on this being the same at runtime */
-       info->d.wbarrier.nursery_bits = DEFAULT_NURSERY_BITS;
        mono_marshal_set_wrapper_info (res, info);
        mono_mb_free (mb);
 

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index c5411cbd7ea8093c062d29734e3ec2a5a6f4268c..8e96bed61a6b55bbbe21bb2d61a4cf731f3c243c 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -2819,7 +2819,6 @@ encode_method_ref (MonoAotCompile *acfg, MonoMethod *method, guint8 *buf, guint8
                }
                case MONO_WRAPPER_WRITE_BARRIER: {
                        g_assert (info);
-                       encode_value (info->d.wbarrier.nursery_bits, p, &p);
                        break;
                }
                case MONO_WRAPPER_STELEMREF: {

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 618a8cb38b6f99edc3781870d35712735bd822af..f40f381ba6491bae483282bc8811b5793f73586f 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -896,15 +896,7 @@ decode_method_ref_with_target (MonoAotModule *module, MethodRef *ref, MonoMethod
                        break;
                }
                case MONO_WRAPPER_WRITE_BARRIER: {
-                       int nursery_bits = decode_value (p, &p);
-
                        ref->method = mono_gc_get_write_barrier ();
-                       if (ref->method) {
-                               /* Sanity check */
-                               info = mono_marshal_get_wrapper_info (ref->method);
-                               g_assert (info);
-                               g_assert (info->d.wbarrier.nursery_bits == nursery_bits);
-                       }
                        break;
                }
                case MONO_WRAPPER_STELEMREF: {

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 646dbc656835a3f4458e634bf0333f379208de07..149833cf2446c7d58d866eb8cef3ecc3ad6be3f6 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -111,7 +111,7 @@
 #endif
 
 /* Version number of the AOT file format */
-#define MONO_AOT_FILE_VERSION 125
+#define MONO_AOT_FILE_VERSION 126
 
 //TODO: This is x86/amd64 specific.
 #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6))