diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index f99e47428b..0a3d9e4572 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -8ebc8326f0876923619de5e491b3e62664479d18 \ No newline at end of file +2ce6c2131f7b8b3079c900084af3240c24f86340 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index d0523edee6..ec7af176b5 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -ee891702d74552bf93cab3258e51f559981be94e \ No newline at end of file +c0e743df5fbb47a5fe35a704f8e79be992a3eadc \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 430193836b..15a98c7c7c 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.18.0.219"; + public const string MonoVersion = "5.18.0.223"; 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/corlib/Test/System.Reflection/ParameterInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs index 521e190a1c..eee45b0b7b 100644 --- a/mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs +++ b/mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs @@ -506,5 +506,14 @@ namespace MonoTests.System.Reflection Assert.AreEqual (expected, actual, "#1"); } + + [Test] + public void ReturnParameter_IsDefined_False () + { + Type type = typeof (object); + MethodInfo method = type.GetMethod ("ToString"); + ParameterInfo paramInfo = method.ReturnParameter; + Assert.IsFalse (paramInfo.IsDefined (typeof (Attribute))); + } } } diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index a57c7fab0e..5c8a0c57aa 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -95acc042739943bbd3647602cba9333708296d2a \ No newline at end of file +ec1b95ed84e41497894ff47af284d09441fe2b9d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 343611deba..76616c7e74 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0bb1a2c71384164b93825b44667cf43cd7514002 \ No newline at end of file +da93afc853249356333970bf2e895a79a4396aa5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index 8a7b04e6f9..5ea731510d 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -725c090642989743bad4eec52fd95b35e3b6997d \ No newline at end of file +87756e5e0786babce29f2252713def5f5097f608 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4dfaf849c4..979c5450c3 100644 Binary files a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll and b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 36cc5b556d..61e6c67adf 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -cf9a42775b0d1659120c13af9cbbd7e707515320 \ No newline at end of file +c1868137ecbfd58a439cb2869f9a49d51ac9c2ae \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 92b4f60883..eca9741e1e 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c29afb83173af842fee496f1a22db5c53d143b8 \ No newline at end of file +4f811e6e585a4688a3d06c49fcf3c80bd71530e2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index c8ed94e12d..00b915fb64 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -d1616fed145503cb7e440209f90de14b222e0521 \ No newline at end of file +57d5497782de74426d145cc380ba1a72ca4c9da2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 6e7e693fa3..eb4b866ed7 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -371b9785e82b18a1731f250d5eacaa3d1975eada \ No newline at end of file +b7be922d9ee313758f015735c542889ec22647c4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index a57c7fab0e..5c8a0c57aa 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -95acc042739943bbd3647602cba9333708296d2a \ No newline at end of file +ec1b95ed84e41497894ff47af284d09441fe2b9d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 343611deba..76616c7e74 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0bb1a2c71384164b93825b44667cf43cd7514002 \ No newline at end of file +da93afc853249356333970bf2e895a79a4396aa5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index 8a7b04e6f9..5ea731510d 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -725c090642989743bad4eec52fd95b35e3b6997d \ No newline at end of file +87756e5e0786babce29f2252713def5f5097f608 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4dfaf849c4..979c5450c3 100644 Binary files a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll and b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 36cc5b556d..61e6c67adf 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -cf9a42775b0d1659120c13af9cbbd7e707515320 \ No newline at end of file +c1868137ecbfd58a439cb2869f9a49d51ac9c2ae \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 92b4f60883..eca9741e1e 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c29afb83173af842fee496f1a22db5c53d143b8 \ No newline at end of file +4f811e6e585a4688a3d06c49fcf3c80bd71530e2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index c8ed94e12d..00b915fb64 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -d1616fed145503cb7e440209f90de14b222e0521 \ No newline at end of file +57d5497782de74426d145cc380ba1a72ca4c9da2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 6e7e693fa3..eb4b866ed7 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -371b9785e82b18a1731f250d5eacaa3d1975eada \ No newline at end of file +b7be922d9ee313758f015735c542889ec22647c4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index a57c7fab0e..5c8a0c57aa 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -95acc042739943bbd3647602cba9333708296d2a \ No newline at end of file +ec1b95ed84e41497894ff47af284d09441fe2b9d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 343611deba..76616c7e74 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0bb1a2c71384164b93825b44667cf43cd7514002 \ No newline at end of file +da93afc853249356333970bf2e895a79a4396aa5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index 8a7b04e6f9..5ea731510d 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -725c090642989743bad4eec52fd95b35e3b6997d \ No newline at end of file +87756e5e0786babce29f2252713def5f5097f608 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4dfaf849c4..979c5450c3 100644 Binary files a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll and b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 36cc5b556d..61e6c67adf 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -cf9a42775b0d1659120c13af9cbbd7e707515320 \ No newline at end of file +c1868137ecbfd58a439cb2869f9a49d51ac9c2ae \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 92b4f60883..eca9741e1e 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c29afb83173af842fee496f1a22db5c53d143b8 \ No newline at end of file +4f811e6e585a4688a3d06c49fcf3c80bd71530e2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index c8ed94e12d..00b915fb64 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -d1616fed145503cb7e440209f90de14b222e0521 \ No newline at end of file +57d5497782de74426d145cc380ba1a72ca4c9da2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 6e7e693fa3..eb4b866ed7 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -371b9785e82b18a1731f250d5eacaa3d1975eada \ No newline at end of file +b7be922d9ee313758f015735c542889ec22647c4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index a57c7fab0e..5c8a0c57aa 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -95acc042739943bbd3647602cba9333708296d2a \ No newline at end of file +ec1b95ed84e41497894ff47af284d09441fe2b9d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 343611deba..76616c7e74 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0bb1a2c71384164b93825b44667cf43cd7514002 \ No newline at end of file +da93afc853249356333970bf2e895a79a4396aa5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index 8a7b04e6f9..5ea731510d 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -725c090642989743bad4eec52fd95b35e3b6997d \ No newline at end of file +87756e5e0786babce29f2252713def5f5097f608 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4dfaf849c4..979c5450c3 100644 Binary files a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll and b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 36cc5b556d..61e6c67adf 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -cf9a42775b0d1659120c13af9cbbd7e707515320 \ No newline at end of file +c1868137ecbfd58a439cb2869f9a49d51ac9c2ae \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 92b4f60883..eca9741e1e 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c29afb83173af842fee496f1a22db5c53d143b8 \ No newline at end of file +4f811e6e585a4688a3d06c49fcf3c80bd71530e2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index c8ed94e12d..00b915fb64 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -d1616fed145503cb7e440209f90de14b222e0521 \ No newline at end of file +57d5497782de74426d145cc380ba1a72ca4c9da2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 6e7e693fa3..eb4b866ed7 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -371b9785e82b18a1731f250d5eacaa3d1975eada \ No newline at end of file +b7be922d9ee313758f015735c542889ec22647c4 \ No newline at end of file diff --git a/mcs/class/referencesource/mscorlib/system/attribute.cs b/mcs/class/referencesource/mscorlib/system/attribute.cs index 853b279af4..5ad2003e30 100644 --- a/mcs/class/referencesource/mscorlib/system/attribute.cs +++ b/mcs/class/referencesource/mscorlib/system/attribute.cs @@ -106,7 +106,10 @@ namespace System { var method = ((MethodInfo) member).GetBaseMethod (); while (true) { - var param = method.GetParametersInternal () [parameter.Position]; + var parameters = method.GetParametersInternal (); + if (parameters?.Length == 0 || parameter.Position < 0) + return false; + var param = parameters [parameter.Position]; if (param.IsDefined (attributeType, false)) return true; diff --git a/mono/mini/mini-generic-sharing.c.REMOVED.git-id b/mono/mini/mini-generic-sharing.c.REMOVED.git-id index 3917715465..c9dc2bd70d 100644 --- a/mono/mini/mini-generic-sharing.c.REMOVED.git-id +++ b/mono/mini/mini-generic-sharing.c.REMOVED.git-id @@ -1 +1 @@ -609a53a4d5b40362f7fe39ab2f449030d2736aea \ No newline at end of file +57e08ffa65f3e577dcb32e486d70450d0293ae1b \ No newline at end of file diff --git a/mono/mini/mini-posix.c b/mono/mini/mini-posix.c index fc00bfa44c..5e0b0d5edb 100644 --- a/mono/mini/mini-posix.c +++ b/mono/mini/mini-posix.c @@ -871,44 +871,6 @@ mono_runtime_setup_stat_profiler (void) #endif /* defined(HOST_WATCHOS) */ #ifndef MONO_CROSS_COMPILE -static gchar -conv_ascii_char (gchar s) -{ - if (s < 0x20) - return '.'; - if (s > 0x7e) - return '.'; - return s; -} - -static void -xxd_mem (gpointer d, int len) -{ - guint8 *data = (guint8 *) d; - - for (int off = 0; off < len; off += 0x10) { - gchar *line = g_strdup_printf ("%p ", data + off); - - for (int i = 0; i < 0x10; i++) { - if ((i + off) >= len) - line = g_strdup_printf ("%s ", line); - else - line = g_strdup_printf ("%s%02x ", line, data [off + i]); - } - - line = g_strdup_printf ("%s ", line); - - for (int i = 0; i < 0x10; i++) { - if ((i + off) >= len) - line = g_strdup_printf ("%s ", line); - else - line = g_strdup_printf ("%s%c", line, conv_ascii_char (data [off + i])); - } - - mono_runtime_printf_err ("%s", line); - } -} - static void dump_memory_around_ip (void *ctx) { @@ -918,7 +880,7 @@ dump_memory_around_ip (void *ctx) gpointer native_ip = MONO_CONTEXT_GET_IP (&mctx); if (native_ip) { mono_runtime_printf_err ("Memory around native instruction pointer (%p):", native_ip); - xxd_mem (((guint8 *) native_ip) - 0x10, 0x40); + mono_dump_mem (((guint8 *) native_ip) - 0x10, 0x40); } else { mono_runtime_printf_err ("instruction pointer is NULL, skip dumping"); } diff --git a/mono/mini/mini-runtime.c.REMOVED.git-id b/mono/mini/mini-runtime.c.REMOVED.git-id index 8ebfc8439c..e1f6e8f492 100644 --- a/mono/mini/mini-runtime.c.REMOVED.git-id +++ b/mono/mini/mini-runtime.c.REMOVED.git-id @@ -1 +1 @@ -4ffa27c9063cdf3e0d77896d2c842852e9f0c50a \ No newline at end of file +33fcb38dbf98e33686022e85ad503d8103dfe9a4 \ No newline at end of file diff --git a/mono/mini/mini.h.REMOVED.git-id b/mono/mini/mini.h.REMOVED.git-id index f86ce6c5cf..e4fc502291 100644 --- a/mono/mini/mini.h.REMOVED.git-id +++ b/mono/mini/mini.h.REMOVED.git-id @@ -1 +1 @@ -971c91d40ee91dced84e3d74a60966636b8545ee \ No newline at end of file +a468afcf5e9b9a7265eaf48d863469c31c4500e8 \ No newline at end of file diff --git a/mono/mini/unwind.c b/mono/mini/unwind.c index b75fd558cf..a459a9715a 100644 --- a/mono/mini/unwind.c +++ b/mono/mini/unwind.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -637,7 +638,11 @@ mono_unwind_frame (guint8 *unwind_info, guint32 unwind_info_len, if (save_locations) memset (save_locations, 0, save_locations_len * sizeof (mgreg_t*)); - g_assert (cfa_reg != -1); + if (cfa_reg == -1) { + mono_runtime_printf_err ("Unset cfa_reg in method %s. Memory around ip (%p):", mono_get_method_from_ip (ip), ip); + mono_dump_mem (ip - 0x10, 0x40); + g_assert_not_reached (); + } cfa_val = (guint8*)regs [mono_dwarf_reg_to_hw_reg (cfa_reg)] + cfa_offset; for (hwreg = 0; hwreg < NUM_HW_REGS; ++hwreg) { if (reg_saved [hwreg] && locations [hwreg].loc_type == LOC_OFFSET) { diff --git a/mono/mini/version.h b/mono/mini/version.h index 9fd7fae2fb..ff225ca51c 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/f919fb5" +#define FULL_VERSION "explicit/3f799cc" diff --git a/mono/utils/mono-logger-internals.h b/mono/utils/mono-logger-internals.h index 5c24a217e1..b3f3cc28f6 100644 --- a/mono/utils/mono-logger-internals.h +++ b/mono/utils/mono-logger-internals.h @@ -161,6 +161,8 @@ void mono_log_write_recorder (const char *log_domain, GLogLevelFlags level, mono void mono_log_close_recorder (void); void mono_log_dump_recorder (void); +void mono_dump_mem (gpointer d, int len); + G_END_DECLS #endif /* __MONO_LOGGER_INTERNAL_H__ */ diff --git a/mono/utils/mono-logger.c b/mono/utils/mono-logger.c index 02a77ac65c..059814beb9 100644 --- a/mono/utils/mono-logger.c +++ b/mono/utils/mono-logger.c @@ -527,3 +527,42 @@ mono_trace_set_printerr_handler (MonoPrintCallback callback) printerr_callback = callback; g_set_printerr_handler (printerr_handler); } + +static gchar +conv_ascii_char (gchar s) +{ + if (s < 0x20) + return '.'; + if (s > 0x7e) + return '.'; + return s; +} + +/* No memfree because only called during crash */ +void +mono_dump_mem (gpointer d, int len) +{ + guint8 *data = (guint8 *) d; + + for (int off = 0; off < len; off += 0x10) { + char *line = g_strdup_printf ("%p ", data + off); + + for (int i = 0; i < 0x10; i++) { + if ((i + off) >= len) + line = g_strdup_printf ("%s ", line); + else + line = g_strdup_printf ("%s%02x ", line, data [off + i]); + } + + line = g_strdup_printf ("%s ", line); + + for (int i = 0; i < 0x10; i++) { + if ((i + off) >= len) + line = g_strdup_printf ("%s ", line); + else + line = g_strdup_printf ("%s%c", line, conv_ascii_char (data [off + i])); + } + + mono_runtime_printf_err ("%s", line); + } +} diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 9201b106cf..ead4b2868e 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 eef029f3d8..925d682816 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -772d8eeb833fa41f10b447d12eebc37aa3e3323f \ No newline at end of file +723f596707c90e1a13902ea845a24fdea7f705e7 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 35eff377c6..f4bd00e5b7 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 215bf1d53b..09c68c4284 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -dc0aaf04951d38b16917bc894246bff93ce21e26 \ No newline at end of file +68b250d0fbd9f9d5507dce0f0bfc52eec5e93bc8 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 5d3add8070..ffb529b85e 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 7b4b74fbe9..af0af80dec 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -793443e70a2c35052b81927873f7d1101a142d68 \ No newline at end of file +a1eac3d238780b5d5ba2fc54c8f0485f594c8c40 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 50b2beda2f..632799a3e6 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.18.0.219\n" +"Project-Id-Version: mono 5.18.0.223\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-12-05 08:06+0000\n" +"POT-Creation-Date: 2018-12-20 08:52+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 516e7351ff..31b6849c34 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 f3391346f4..8fdb0d0069 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -954bc8d2cf80649e0b4953cec68a5ac972a4a221 \ No newline at end of file +b5d5713efa0d508accb48fe56ee03d5e01155465 \ No newline at end of file