Imported Upstream version 4.8.0.489

Former-commit-id: 711682279101ddc89ff7b3b8639a574568fd6a0f
2017-02-15 10:05:45 +00:00
parent f38a7b4f5b
commit 702a3ab1af
41 changed files with 68 additions and 94 deletions
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -458,8 +458,9 @@ struct MonoVTable {
 	guint8     *interface_bitmap;
 	guint16     max_interface_id;
 	guint8      rank;
+	/* Keep this a guint8, the jit depends on it */
+	guint8      initialized; /* cctor has been run */
 	guint remote          : 1; /* class is remotely activated */
-	guint initialized     : 1; /* cctor has been run */
 	guint init_failed     : 1; /* cctor execution failed */
 	guint has_static_fields : 1; /* pointer to the data stored at the end of the vtable array */
 	guint gc_bits         : MONO_VTABLE_AVAILABLE_GC_BITS; /* Those bits are reserved for the usaged of the GC */
--- a/mono/metadata/object-offsets.h
+++ b/mono/metadata/object-offsets.h
@@ -76,6 +76,7 @@ DECL_OFFSET(MonoVTable, max_interface_id)
 DECL_OFFSET(MonoVTable, interface_bitmap)
 DECL_OFFSET(MonoVTable, vtable)
 DECL_OFFSET(MonoVTable, rank)
+DECL_OFFSET(MonoVTable, initialized)
 DECL_OFFSET(MonoVTable, type)
 DECL_OFFSET(MonoVTable, runtime_generic_context)

--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in

 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.8.0.483/ba7f169\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.8.0.489/9ac5bf2\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in

 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.8.0.483/ba7f169\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.8.0.489/9ac5bf2\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.in.REMOVED.git-id
+++ b/mono/mini/Makefile.in.REMOVED.git-id
@@ -1 +1 @@
-9e66f81dfb8f381a6cdc81e9852487bb391c9616
+d78d3160cb95346fa22eb7f257a9e51030af6b97
--- a/mono/mini/debugger-agent.c.REMOVED.git-id
+++ b/mono/mini/debugger-agent.c.REMOVED.git-id
@@ -1 +1 @@
-f778f59ada713a7c2556d4dbea1ef6473d3650a2
+0ec7f5958e3856cfe956471328e27fb9dc3e5de6
--- a/mono/mini/method-to-ir.c.REMOVED.git-id
+++ b/mono/mini/method-to-ir.c.REMOVED.git-id
@@ -1 +1 @@
-989d1ceee9a69e6fa24b8a468e3ee04693b4a338
+c78dd666bf120a7b972ce43e3aa949f6e124d7e5
--- a/mono/mini/mini-amd64.c.REMOVED.git-id
+++ b/mono/mini/mini-amd64.c.REMOVED.git-id
@@ -1 +1 @@
-3db3f59ac8a8d3be96d86874d46e4ac43a7e450a
+9252453243a187d9d4e4d8af4894553d7f3c8c52
--- a/mono/mini/mini-arm.c.REMOVED.git-id
+++ b/mono/mini/mini-arm.c.REMOVED.git-id
@@ -1 +1 @@
-8b0b61e62ad3a349c2c1721e0d36365f3697eccf
+0784d290c0c1991dbc02f5b7cf69a367983f3d7e
--- a/mono/mini/mini-arm64.c.REMOVED.git-id
+++ b/mono/mini/mini-arm64.c.REMOVED.git-id
@@ -1 +1 @@
-b4871f36b910f3efc6be8a41a65c6d80a1e7d70b
+6cf2ec475565f30874bec535d48ea4435ea66ca4
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@@ -1 +1 @@
-#define FULL_VERSION "Stable 4.8.0.483/ba7f169"
+#define FULL_VERSION "Stable 4.8.0.489/9ac5bf2"