From 76890153dff6910158f6c919d6b23a9c3178f7b3 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 5 Oct 2019 08:58:44 +0000 Subject: [PATCH] Imported Upstream version 6.6.0.110 Former-commit-id: c9672f5a0af86230bea096498f84f5d8396948ac --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../CustomAttributeBuilderTest.cs | 34 ++++++++++++++++++ .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/loader.c | 9 +++-- mono/metadata/sre.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 +-- mono/utils/mono-merp.c | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 49 files changed, 85 insertions(+), 48 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 764c363c60..00b393df45 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e2349164fad4ccd2424944cf6b3605ae76e1f876 \ No newline at end of file +1892799cec7ada77bf0412de6037695b26342760 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 4568e2b131..6ce5c46a07 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -1e5e08337bc1443e8611aa9a92c9fd36e0baf00f \ No newline at end of file +70613a61062dae31e2ddc737e6095df647b9222a \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 22d50615fb..226c661dc3 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.6.0.108"; + public const string MonoVersion = "6.6.0.110"; 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.Emit/CustomAttributeBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/CustomAttributeBuilderTest.cs index 1eb0e9a304..b4311cef67 100644 --- a/mcs/class/corlib/Test/System.Reflection.Emit/CustomAttributeBuilderTest.cs +++ b/mcs/class/corlib/Test/System.Reflection.Emit/CustomAttributeBuilderTest.cs @@ -899,6 +899,40 @@ namespace MonoTests.System.Reflection.Emit } + [Test] + public void MethodInfoGetParametersCrash () { + // Regression test for https://github.com/mono/mono/issues/16570 + // + // MethodInfo.GetParameters() called on a dynamic assembly would attempt to copy the custom_name and cookie, which could be junk depending + // on how the union is being used. + var aName = new AssemblyName("TestAssembly"); + var testAssembly = AppDomain.CurrentDomain.DefineDynamicAssembly(aName, AssemblyBuilderAccess.RunAndSave); + var testModule = testAssembly.DefineDynamicModule(aName.Name, aName.Name + ".dll"); + + var typeBuilder = testModule.DefineType("TestType"); + + var ctorBuilder = typeBuilder.DefineConstructor(MethodAttributes.Public, CallingConventions.Standard, Type.EmptyTypes); + + var ctorIl = ctorBuilder.GetILGenerator(); + ctorIl.Emit(OpCodes.Ret); + + var methodBuilder = typeBuilder.DefineMethod("TestMethod", MethodAttributes.Public, typeof(void), new[] { typeof(int[]) }); + methodBuilder.DefineParameter(0, ParameterAttributes.Retval, null); + var paramBuilder = methodBuilder.DefineParameter(1, ParameterAttributes.None, null); + + var attrCtor = typeof(MarshalAsAttribute).GetConstructor(new[] { typeof(UnmanagedType) }); + object[] ctorArgs = { UnmanagedType.LPArray }; + var attr = new CustomAttributeBuilder(attrCtor, ctorArgs); + paramBuilder.SetCustomAttribute(attr); + + var methodIl = methodBuilder.GetILGenerator(); + methodIl.Emit(OpCodes.Ret); + + var createdType = typeBuilder.CreateType(); + + var methodInfo = createdType.GetMethod("TestMethod", BindingFlags.Instance | BindingFlags.Public); + methodInfo.GetParameters(); + } } } diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index a56c3ea947..2c2d55e3e3 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b10ab205f4ddf7ade4f67c298be0e63e3c5f8f21 \ No newline at end of file +caf320d7af68ab2292a74eaebc24abaaa73bc823 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index fca81ffa47..8d64a9ded2 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e3f5bd3451532718c09696f79f48473f70fa4fda \ No newline at end of file +6e8d50c11337ba8f959ec423db910c0b07ab10e8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index d812356842..4152275e4a 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -3663feb80116629dcca2773e113a1deafac0bce0 \ No newline at end of file +976719b6445a59f2bf752893a8f522a8bb79acd7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index acb27afe2d..79aff846ec 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -327b3da707a9b6f16d9231839094d1ca0765c5f5 \ No newline at end of file +88a1a82e64083f00bace15e5a311c0b122c253dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index f24ab26d57..b71c91675f 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4bc82e5018b862e746408c4226aaabb48a39c7ce \ No newline at end of file +4926d847d735b80ad575ac900921accb700e8903 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index 912670e7eb..a4ffcc2f77 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7fc65f5a9b87a7c64125074e2dcf74a3ae422bb4 \ No newline at end of file +40297b60f2bc031edde89c3c6005261256e6af6c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index 02f5c938bb..a99a83ebc6 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -50c42c6133e6f0da5d405fe88fa3fe18c494d6e7 \ No newline at end of file +21d681f5d1db13f93644fc3c267c0835414019af \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index a56c3ea947..2c2d55e3e3 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b10ab205f4ddf7ade4f67c298be0e63e3c5f8f21 \ No newline at end of file +caf320d7af68ab2292a74eaebc24abaaa73bc823 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index fca81ffa47..8d64a9ded2 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e3f5bd3451532718c09696f79f48473f70fa4fda \ No newline at end of file +6e8d50c11337ba8f959ec423db910c0b07ab10e8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index d812356842..4152275e4a 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -3663feb80116629dcca2773e113a1deafac0bce0 \ No newline at end of file +976719b6445a59f2bf752893a8f522a8bb79acd7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index acb27afe2d..79aff846ec 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -327b3da707a9b6f16d9231839094d1ca0765c5f5 \ No newline at end of file +88a1a82e64083f00bace15e5a311c0b122c253dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index f24ab26d57..b71c91675f 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4bc82e5018b862e746408c4226aaabb48a39c7ce \ No newline at end of file +4926d847d735b80ad575ac900921accb700e8903 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index 912670e7eb..a4ffcc2f77 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7fc65f5a9b87a7c64125074e2dcf74a3ae422bb4 \ No newline at end of file +40297b60f2bc031edde89c3c6005261256e6af6c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id index c1b4711553..702dc4e8a7 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -130318c7d2a52a90714b422cfad67998f7bb3cf7 \ No newline at end of file +22403c79d060f70ba34580a710c36d91f3d7c34c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index 02f5c938bb..a99a83ebc6 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -50c42c6133e6f0da5d405fe88fa3fe18c494d6e7 \ No newline at end of file +21d681f5d1db13f93644fc3c267c0835414019af \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index a56c3ea947..2c2d55e3e3 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b10ab205f4ddf7ade4f67c298be0e63e3c5f8f21 \ No newline at end of file +caf320d7af68ab2292a74eaebc24abaaa73bc823 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index fca81ffa47..8d64a9ded2 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e3f5bd3451532718c09696f79f48473f70fa4fda \ No newline at end of file +6e8d50c11337ba8f959ec423db910c0b07ab10e8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index d812356842..4152275e4a 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -3663feb80116629dcca2773e113a1deafac0bce0 \ No newline at end of file +976719b6445a59f2bf752893a8f522a8bb79acd7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index acb27afe2d..79aff846ec 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -327b3da707a9b6f16d9231839094d1ca0765c5f5 \ No newline at end of file +88a1a82e64083f00bace15e5a311c0b122c253dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index f24ab26d57..b71c91675f 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4bc82e5018b862e746408c4226aaabb48a39c7ce \ No newline at end of file +4926d847d735b80ad575ac900921accb700e8903 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index 912670e7eb..a4ffcc2f77 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7fc65f5a9b87a7c64125074e2dcf74a3ae422bb4 \ No newline at end of file +40297b60f2bc031edde89c3c6005261256e6af6c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id index c1b4711553..702dc4e8a7 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -130318c7d2a52a90714b422cfad67998f7bb3cf7 \ No newline at end of file +22403c79d060f70ba34580a710c36d91f3d7c34c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index 02f5c938bb..a99a83ebc6 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -50c42c6133e6f0da5d405fe88fa3fe18c494d6e7 \ No newline at end of file +21d681f5d1db13f93644fc3c267c0835414019af \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index a56c3ea947..2c2d55e3e3 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b10ab205f4ddf7ade4f67c298be0e63e3c5f8f21 \ No newline at end of file +caf320d7af68ab2292a74eaebc24abaaa73bc823 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index fca81ffa47..8d64a9ded2 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e3f5bd3451532718c09696f79f48473f70fa4fda \ No newline at end of file +6e8d50c11337ba8f959ec423db910c0b07ab10e8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index 7f0b339075..ec949d7f4c 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -9bcfceec699d6367b78ca0c5399160d4bdf5c80a \ No newline at end of file +2898bed814b77dafab7c2592e8971fb8b05c0e8e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index acb27afe2d..79aff846ec 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -327b3da707a9b6f16d9231839094d1ca0765c5f5 \ No newline at end of file +88a1a82e64083f00bace15e5a311c0b122c253dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index f24ab26d57..b71c91675f 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4bc82e5018b862e746408c4226aaabb48a39c7ce \ No newline at end of file +4926d847d735b80ad575ac900921accb700e8903 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index 912670e7eb..a4ffcc2f77 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7fc65f5a9b87a7c64125074e2dcf74a3ae422bb4 \ No newline at end of file +40297b60f2bc031edde89c3c6005261256e6af6c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id index c1b4711553..702dc4e8a7 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -130318c7d2a52a90714b422cfad67998f7bb3cf7 \ No newline at end of file +22403c79d060f70ba34580a710c36d91f3d7c34c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index a9750f860c..31bd4b1359 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b54ef7f2f86747166ea4b8a626acea06a69b43a5 \ No newline at end of file +7c4a107bea57f9283f659879f057d341afe17f6f \ No newline at end of file diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index 90cbc16ad3..1d6624bfe4 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -2369,13 +2369,16 @@ mono_method_get_marshal_info (MonoMethod *method, MonoMarshalSpec **mspecs) ((MonoDynamicImage*)m_class_get_image (method->klass))->method_aux_hash, method); if (method_aux && method_aux->param_marshall) { MonoMarshalSpec **dyn_specs = method_aux->param_marshall; - for (i = 0; i < signature->param_count + 1; ++i) + for (i = 0; i < signature->param_count + 1; ++i) { if (dyn_specs [i]) { mspecs [i] = g_new0 (MonoMarshalSpec, 1); memcpy (mspecs [i], dyn_specs [i], sizeof (MonoMarshalSpec)); - mspecs [i]->data.custom_data.custom_name = g_strdup (dyn_specs [i]->data.custom_data.custom_name); - mspecs [i]->data.custom_data.cookie = g_strdup (dyn_specs [i]->data.custom_data.cookie); + if (mspecs [i]->native == MONO_NATIVE_CUSTOM) { + mspecs [i]->data.custom_data.custom_name = g_strdup (dyn_specs [i]->data.custom_data.custom_name); + mspecs [i]->data.custom_data.cookie = g_strdup (dyn_specs [i]->data.custom_data.cookie); + } } + } } return; } diff --git a/mono/metadata/sre.c.REMOVED.git-id b/mono/metadata/sre.c.REMOVED.git-id index a50a168110..3ee1373801 100644 --- a/mono/metadata/sre.c.REMOVED.git-id +++ b/mono/metadata/sre.c.REMOVED.git-id @@ -1 +1 @@ -f8779a607fd50b42ee7c6b46ca44b20077d5aef4 \ No newline at end of file +97f1d8e077e9c636d89442c9e3a07fe7ba57d205 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 29f1b09385..c1ddcddd76 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/bd72952" +#define FULL_VERSION "explicit/9e6def1" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index eed954ce12..7b45dbc879 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1496,10 +1496,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@clean-local: -@HOST_WIN32_TRUE@clean-local: @CROSS_COMPILE_TRUE@test-local: @HOST_WIN32_TRUE@test-local: +@CROSS_COMPILE_TRUE@clean-local: +@HOST_WIN32_TRUE@clean-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/mono/utils/mono-merp.c b/mono/utils/mono-merp.c index 8bf5b65360..d2652e4790 100644 --- a/mono/utils/mono-merp.c +++ b/mono/utils/mono-merp.c @@ -346,7 +346,7 @@ mono_merp_send (MERPStruct *merp) if (WIFEXITED(status)) { exit_status = WEXITSTATUS(status); exit_success = TRUE; - invoke_success = exit_status == TRUE; + invoke_success = (exit_status == 0); break; } else if (WIFSIGNALED(status)) { break; diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index c6815897d7fd20f4c11401f327c867a218ca5f9d..8efad21c98c4d8cbf44a8b5f2874000df386bbe4 100644 GIT binary patch delta 14 VcmbQIHBW29Q!Yl+&Cj?jxBx6W1xo+` delta 14 VcmbQIHBW29Q!Yl6&Cj?jxBx6Q1xf$_ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 7134071d93..8a0fed201d 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -e727019f93cee4e44d819fe38f455666a5410ec7 \ No newline at end of file +09fd221bc0ec10d0419aeb8d117cd3bd8fceb7f4 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 6221820d0de73d8a9a6c1f5f9a24ab718cf5338c..ab94e5442c13cc321be9c2ad604d8e5d6c363be3 100644 GIT binary patch delta 14 VcmX?Ef3kjqo+6{^W_`t3asV+K1%Utn delta 14 VcmX?Ef3kjqo+6{kW_`t3asV+E1%Lnm diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 6d68b39e02..ef99c3f288 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -cfd7c03350f27a21f5e8f316dc86775666cce613 \ No newline at end of file +2124fa078b1871a7613be97ca0e5c7c59753be38 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 830ec0d15b441213560ec3c4fa82cd75b8efaa98..8829c989e1e81cd0734d9e88845566a6f3ebdfe8 100644 GIT binary patch delta 16 Xcmeyri1Gg-#tj_mjHa78)yuR1JoN?L delta 16 Xcmeyri1Gg-#tj_mj3%2o)yuR1JnseE diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 23154138ed..70bc4db9fd 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -aec18ddaf444a4ce62c19bfe092eb30d1b754407 \ No newline at end of file +4eba3ac18722dedf93f574c649ac970e80a23f29 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 67276f5bef..8476a89c27 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.6.0.108\n" +"Project-Id-Version: mono 6.6.0.110\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-10-04 08:30+0000\n" +"POT-Creation-Date: 2019-10-05 08:30+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 c4a274b44fc1e1f5f90809f8b2deb4a3e551bd3d..235d09a23abe29cd111aa239156fcaa33b013d72 100644 GIT binary patch delta 16 YcmaF1gXP%{mJM-J8BI6GPi1ch07X;>Qvd(} delta 16 YcmaF1gXP%{mJM-J8BI3FPi1ch07Xs*QUCw| diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 43a84512ef..3a6118c0da 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -98fb9d36ed14a4c6389304d8fd50110df62cc70a \ No newline at end of file +95f1b4966f8c63c3290557f273f7656bb72a4ab4 \ No newline at end of file