diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 6d4000a030..187940bbb0 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -4d4ef565049e2cd1fa0bf44be14ae23d425026b8 \ No newline at end of file +524ba0e2153f00fd9b26bb62716c5aebe3699e4e \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 6f6e6678a5..efab322d45 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -9e0a9efcb9f0156b8fa33eba4a59a8ed823bebc7 \ No newline at end of file +41418edcfc9fd6d10a220b77dfe877083354010b \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 01882f7c77..dc712286f3 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.16.0.135"; + public const string MonoVersion = "5.16.0.138"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id index 9a8ddd5f89..d23c8e497b 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -69bd0fc4c0542553b5fd030f3aa2be77d44b91a0 \ No newline at end of file +9216d3ed8800bcdfdc6a5e463b344517288ad5f5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id index 37baff2637..5e8bb8a3a3 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -41237ab35261a093d70cfb46a706988944a2fe91 \ No newline at end of file +aa04f998874a2d4e0401e1526b9bc27990395dda \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll index e3a8b21c27..354708bba7 100644 Binary files a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id index 9927fc9a77..eca8a36ad4 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -9dad5a97d4beb66ca299a769b1120d1a8e216baf \ No newline at end of file +28d58bce80aa5b3145529340c21753a015bda1b1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id index e5344139fb..f68ab6a98b 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647 \ No newline at end of file +e956e1c5bf7cd5513905945fb1e0dbd698d0e9cb \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id index d8722baf54..566f62fe61 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6db7ca567c9f0072c556397c50da9169e5058892 \ No newline at end of file +ff8f7cfd19f6ae18ae59b7ad302b258cd2fdfd26 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id index 2efa63f69e..88bda124b7 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4b7b0a51812de6a0fb4f6476fa3464b18278f342 \ No newline at end of file +3fca1498811010bee896ad86aa1b4129977d120c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id index a5ce870bb8..b68e592eb0 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -bf69562e337368809f7b67ed4f50b9ae2d18add3 \ No newline at end of file +cdf1d90c98a67e04009c1f9c9216b67cd2677708 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id index 9a8ddd5f89..d23c8e497b 100644 --- a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -69bd0fc4c0542553b5fd030f3aa2be77d44b91a0 \ No newline at end of file +9216d3ed8800bcdfdc6a5e463b344517288ad5f5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id index 37baff2637..5e8bb8a3a3 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -41237ab35261a093d70cfb46a706988944a2fe91 \ No newline at end of file +aa04f998874a2d4e0401e1526b9bc27990395dda \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll index e3a8b21c27..354708bba7 100644 Binary files a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id index 9927fc9a77..eca8a36ad4 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -9dad5a97d4beb66ca299a769b1120d1a8e216baf \ No newline at end of file +28d58bce80aa5b3145529340c21753a015bda1b1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id index e5344139fb..f68ab6a98b 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647 \ No newline at end of file +e956e1c5bf7cd5513905945fb1e0dbd698d0e9cb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id index d8722baf54..566f62fe61 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6db7ca567c9f0072c556397c50da9169e5058892 \ No newline at end of file +ff8f7cfd19f6ae18ae59b7ad302b258cd2fdfd26 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id index 2efa63f69e..88bda124b7 100644 --- a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4b7b0a51812de6a0fb4f6476fa3464b18278f342 \ No newline at end of file +3fca1498811010bee896ad86aa1b4129977d120c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id index a5ce870bb8..b68e592eb0 100644 --- a/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -bf69562e337368809f7b67ed4f50b9ae2d18add3 \ No newline at end of file +cdf1d90c98a67e04009c1f9c9216b67cd2677708 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id index 9a8ddd5f89..d23c8e497b 100644 --- a/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -69bd0fc4c0542553b5fd030f3aa2be77d44b91a0 \ No newline at end of file +9216d3ed8800bcdfdc6a5e463b344517288ad5f5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id index 37baff2637..5e8bb8a3a3 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -41237ab35261a093d70cfb46a706988944a2fe91 \ No newline at end of file +aa04f998874a2d4e0401e1526b9bc27990395dda \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll index e3a8b21c27..354708bba7 100644 Binary files a/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id index 9927fc9a77..eca8a36ad4 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -9dad5a97d4beb66ca299a769b1120d1a8e216baf \ No newline at end of file +28d58bce80aa5b3145529340c21753a015bda1b1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id index e5344139fb..f68ab6a98b 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647 \ No newline at end of file +e956e1c5bf7cd5513905945fb1e0dbd698d0e9cb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id index d8722baf54..566f62fe61 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6db7ca567c9f0072c556397c50da9169e5058892 \ No newline at end of file +ff8f7cfd19f6ae18ae59b7ad302b258cd2fdfd26 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id index 2efa63f69e..88bda124b7 100644 --- a/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4b7b0a51812de6a0fb4f6476fa3464b18278f342 \ No newline at end of file +3fca1498811010bee896ad86aa1b4129977d120c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id index a5ce870bb8..b68e592eb0 100644 --- a/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -bf69562e337368809f7b67ed4f50b9ae2d18add3 \ No newline at end of file +cdf1d90c98a67e04009c1f9c9216b67cd2677708 \ No newline at end of file diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h index ad2b2a5aa6..eaabf5df48 100644 --- a/mono/metadata/object-internals.h +++ b/mono/metadata/object-internals.h @@ -13,6 +13,7 @@ #include #include #include +#include #include "mono/utils/mono-compiler.h" #include "mono/utils/mono-error.h" #include "mono/utils/mono-error-internals.h" @@ -135,6 +136,8 @@ struct _MonoString { mono_unichar2 chars [MONO_ZERO_LEN_ARRAY]; }; +#define MONO_SIZEOF_MONO_STRING (MONO_STRUCT_OFFSET (MonoString, chars)) + #define mono_object_class(obj) (((MonoObject*)(obj))->vtable->klass) #define mono_object_domain(obj) (((MonoObject*)(obj))->vtable->domain) diff --git a/mono/metadata/object.c.REMOVED.git-id b/mono/metadata/object.c.REMOVED.git-id index 447cd5da67..fce8f408f0 100644 --- a/mono/metadata/object.c.REMOVED.git-id +++ b/mono/metadata/object.c.REMOVED.git-id @@ -1 +1 @@ -408c5d201edf2695cf70e933d9e77959fd6a1f33 \ No newline at end of file +960a260ea505c05f293bd6311205a73eb083e26f \ No newline at end of file diff --git a/mono/metadata/sgen-client-mono.h b/mono/metadata/sgen-client-mono.h index e200225799..0de2fa83e5 100644 --- a/mono/metadata/sgen-client-mono.h +++ b/mono/metadata/sgen-client-mono.h @@ -115,7 +115,7 @@ sgen_client_slow_object_get_size (GCVTable vtable, GCObject* o) * mono_array_length_fast not using the object's vtable. */ if (klass == mono_defaults.string_class) { - return G_STRUCT_OFFSET (MonoString, chars) + 2 * mono_string_length_fast ((MonoString*) o) + 2; + return MONO_SIZEOF_MONO_STRING + 2 * mono_string_length_fast ((MonoString*) o) + 2; } else if (m_class_get_rank (klass)) { return sgen_mono_array_size (vtable, (MonoArray*)o, NULL, 0); } else { diff --git a/mono/mini/builtin-types.cs b/mono/mini/builtin-types.cs index c4a3045a07..69b328de8c 100644 --- a/mono/mini/builtin-types.cs +++ b/mono/mini/builtin-types.cs @@ -754,6 +754,12 @@ public class BuiltinTests { return 0; } + static int test_0_nfloat_isnan () + { + var x = (nfloat) float.NaN; + return nfloat.IsNaN (x) ? 0 : 1; + } + // static int test_0_nfloat_call_boxed_equals () // { // object x = new nfloat (10f); diff --git a/mono/mini/interp/transform.c.REMOVED.git-id b/mono/mini/interp/transform.c.REMOVED.git-id index 17d1b742ea..4662e05d13 100644 --- a/mono/mini/interp/transform.c.REMOVED.git-id +++ b/mono/mini/interp/transform.c.REMOVED.git-id @@ -1 +1 @@ -bacf63405d960e27d5c22d091b687e9f914574ab \ No newline at end of file +77cce7da80d67381efcaaa44dca2990738cd9dd6 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index f0612b18bf..da36b54360 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/ac8b05bd" +#define FULL_VERSION "explicit/3a18dce" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 8c65840394..53ed84d55a 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 5d2f96f6a6..288d8445df 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -c97f53c1a02209c0dc09fe8b6312e60f7fa52bef \ No newline at end of file +9935789958d81f0128a01e7bd644d56c888ef96e \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 8c389c694f..61b7d4abb6 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index d266450821..0807b65096 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -691d93b3677ff19915310263729d818f55720a48 \ No newline at end of file +22d59f4082d1b7273813a16d2fdc7f2917b49416 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 3397e3a369..1a52dac557 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 9efadf169f..3e25576705 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -8ebad121d3967fa847df6d03ebdf71d9ba78af6a \ No newline at end of file +5d012f5f1f5d51bd5c716eeffd718f3764877881 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 1275601ae8..666e471fa6 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.16.0.135\n" +"Project-Id-Version: mono 5.16.0.138\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-09-01 08:06+0000\n" +"POT-Creation-Date: 2018-09-02 08:04+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index d939dde801..55b9a84f37 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index b7d14b1688..bbfd87cac6 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -fcd4a445ec738115bf0045081739c897f7e438f0 \ No newline at end of file +39cb0fcda7ef407aaf45e01c1d3dc8eb4ce9bc35 \ No newline at end of file