From 5014728567edc1ca36291931087e03b6c28e2419 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 23 Oct 2018 08:23:38 +0000 Subject: [PATCH] Imported Upstream version 5.18.0.175 Former-commit-id: 4da3f5a0da82aba8257bc2cfeadea4fa9438fac4 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- docs/deploy/mono-api-class.html | 2 +- mcs/build/common/Consts.cs | 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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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/dis/dump.c | 2 +- mono/metadata/class-init.c.REMOVED.git-id | 2 +- mono/metadata/class-internals.h | 6 +++++ mono/metadata/class.c.REMOVED.git-id | 2 +- mono/metadata/class.h | 4 ++-- mono/metadata/custom-attrs.c | 12 +++++----- mono/metadata/icall-internals.h | 9 ++++++++ mono/metadata/icall.c.REMOVED.git-id | 2 +- mono/metadata/loader.c | 2 +- mono/metadata/loader.h | 8 +++---- mono/metadata/marshal-ilgen.c.REMOVED.git-id | 2 +- mono/metadata/marshal.c.REMOVED.git-id | 2 +- mono/metadata/metadata.c.REMOVED.git-id | 2 +- mono/metadata/object.c.REMOVED.git-id | 2 +- mono/metadata/pal-icalls.c | 5 +++-- mono/metadata/reflection.c | 2 +- mono/metadata/sgen-toggleref.c | 4 ++++ mono/metadata/sgen-toggleref.h | 2 +- mono/metadata/sre-encode.c | 2 +- mono/metadata/sre.c.REMOVED.git-id | 2 +- mono/metadata/verify.c.REMOVED.git-id | 2 +- mono/metadata/w32file-unix.c.REMOVED.git-id | 2 +- mono/mini/aot-compiler.c.REMOVED.git-id | 2 +- mono/mini/aot-runtime-wasm.c | 2 +- mono/mini/branch-opts.c | 2 +- mono/mini/debugger-agent.c.REMOVED.git-id | 2 +- mono/mini/dwarfwriter.c | 6 ++--- mono/mini/interp/interp-internals.h | 2 +- mono/mini/interp/interp.c.REMOVED.git-id | 2 +- mono/mini/interp/transform.c.REMOVED.git-id | 2 +- mono/mini/method-to-ir.c.REMOVED.git-id | 2 +- .../mini-generic-sharing.c.REMOVED.git-id | 2 +- mono/mini/mini-llvm.c.REMOVED.git-id | 2 +- mono/mini/mini-runtime.c.REMOVED.git-id | 2 +- mono/mini/mini-s390x.c.REMOVED.git-id | 2 +- mono/mini/mini-wasm.c | 2 +- mono/mini/mini.c.REMOVED.git-id | 2 +- mono/mini/tasklets.c | 21 +++++++++--------- mono/mini/version.h | 2 +- mono/profiler/log.c.REMOVED.git-id | 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 +- 85 files changed, 117 insertions(+), 96 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 0ece5b4a47..3c47d0be5f 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e7676284a28529def2313ff3d9d16399599feb5a \ No newline at end of file +20c0003b33cfa61aaa10466350a03f30d8f0116d \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 249db498a0..f6fa78c754 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -57aea1ddfca9ac0e28658115f2e9d64af595dea2 \ No newline at end of file +2cdceed54f5421c980497656cd9258fefa2f6571 \ No newline at end of file diff --git a/docs/deploy/mono-api-class.html b/docs/deploy/mono-api-class.html index 091e622bd7..92b8c0fe92 100644 --- a/docs/deploy/mono-api-class.html +++ b/docs/deploy/mono-api-class.html @@ -1070,7 +1070,7 @@ mono_class_instance_size (MonoClass *klass)
Syntax
-
gboolean +
mono_bool mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass)
diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index dd96697430..9166aa1e69 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.170"; + public const string MonoVersion = "5.18.0.175"; 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-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 ecd5e0a6a6..6e786f0bc3 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 @@ -9fd23fb5d11f48db3c6617281544330923c0fb4f \ No newline at end of file +db7bc510530e8816732e87bfca63d40a7cdfa2e1 \ 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 dce46fef79..54faff41ad 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 @@ -34119802dd4c3fb18352e9841c78ae89bb9bf8b5 \ No newline at end of file +29721b37a6731490e8d1a1e15518934ea9ad110e \ 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 ca1ee5aaf8..5745484bbc 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 @@ -6085ab7d0fcc015d403fc80ec1919c010d57d7b9 \ No newline at end of file +8f5db28b4b38bf6efbb20560283df89c46fb69a1 \ 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 07b12daa3ce971d98cb3b2fe154611707c4961a5..11a0657daa32d7e82f76799801262742e8382676 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ{Z^2;fsD0`0W=H{Bt8kG%xQvKx6lj$Y6b%} Q04kTDeE}-BXA=RLaNrLYs{jB1 delta 58 zcmZqZU~A}Lo6x~>d2P^v#-6P`j3zt+VV3>Njnl3CR_0k1$%u6tZ@<99n8n6yz@RmK OK`o=!_H<#!nFRoeloWjc 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 f47d1c7676..a2565457e9 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 @@ -7461f44dc8fba16c94aae0b77f90a2c244abbbf3 \ No newline at end of file +1e43898d5c0583301d258392ef291a57abeca266 \ 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 727787426e..0b10ed2ae3 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 @@ -e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 \ No newline at end of file +c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85 \ 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 9c2fe24fbc..4f80ead132 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 @@ -3f39704c9ca7c7c843c26e835dac8242d2fbea2d \ No newline at end of file +a1cac209c7dedafd359f0a91fb3c617dc231d24a \ 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 5b4ebe1115..724a67c3b1 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 @@ -39d2084efa771325cbde99e8772fa026c5a276a9 \ No newline at end of file +2031b2e0f6fef9ac96eb559fa04c49c3c02c914c \ 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 ecd5e0a6a6..6e786f0bc3 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 @@ -9fd23fb5d11f48db3c6617281544330923c0fb4f \ No newline at end of file +db7bc510530e8816732e87bfca63d40a7cdfa2e1 \ 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 dce46fef79..54faff41ad 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 @@ -34119802dd4c3fb18352e9841c78ae89bb9bf8b5 \ No newline at end of file +29721b37a6731490e8d1a1e15518934ea9ad110e \ 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 ca1ee5aaf8..5745484bbc 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 @@ -6085ab7d0fcc015d403fc80ec1919c010d57d7b9 \ No newline at end of file +8f5db28b4b38bf6efbb20560283df89c46fb69a1 \ 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 07b12daa3ce971d98cb3b2fe154611707c4961a5..11a0657daa32d7e82f76799801262742e8382676 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ{Z^2;fsD0`0W=H{Bt8kG%xQvKx6lj$Y6b%} Q04kTDeE}-BXA=RLaNrLYs{jB1 delta 58 zcmZqZU~A}Lo6x~>d2P^v#-6P`j3zt+VV3>Njnl3CR_0k1$%u6tZ@<99n8n6yz@RmK OK`o=!_H<#!nFRoeloWjc 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 f47d1c7676..a2565457e9 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 @@ -7461f44dc8fba16c94aae0b77f90a2c244abbbf3 \ No newline at end of file +1e43898d5c0583301d258392ef291a57abeca266 \ 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 727787426e..0b10ed2ae3 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 @@ -e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 \ No newline at end of file +c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85 \ 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 9c2fe24fbc..4f80ead132 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 @@ -3f39704c9ca7c7c843c26e835dac8242d2fbea2d \ No newline at end of file +a1cac209c7dedafd359f0a91fb3c617dc231d24a \ 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 5b4ebe1115..724a67c3b1 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 @@ -39d2084efa771325cbde99e8772fa026c5a276a9 \ No newline at end of file +2031b2e0f6fef9ac96eb559fa04c49c3c02c914c \ 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 ecd5e0a6a6..6e786f0bc3 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 @@ -9fd23fb5d11f48db3c6617281544330923c0fb4f \ No newline at end of file +db7bc510530e8816732e87bfca63d40a7cdfa2e1 \ 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 dce46fef79..54faff41ad 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 @@ -34119802dd4c3fb18352e9841c78ae89bb9bf8b5 \ No newline at end of file +29721b37a6731490e8d1a1e15518934ea9ad110e \ 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 ca1ee5aaf8..5745484bbc 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 @@ -6085ab7d0fcc015d403fc80ec1919c010d57d7b9 \ No newline at end of file +8f5db28b4b38bf6efbb20560283df89c46fb69a1 \ 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 07b12daa3ce971d98cb3b2fe154611707c4961a5..11a0657daa32d7e82f76799801262742e8382676 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ{Z^2;fsD0`0W=H{Bt8kG%xQvKx6lj$Y6b%} Q04kTDeE}-BXA=RLaNrLYs{jB1 delta 58 zcmZqZU~A}Lo6x~>d2P^v#-6P`j3zt+VV3>Njnl3CR_0k1$%u6tZ@<99n8n6yz@RmK OK`o=!_H<#!nFRoeloWjc 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 f47d1c7676..a2565457e9 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 @@ -7461f44dc8fba16c94aae0b77f90a2c244abbbf3 \ No newline at end of file +1e43898d5c0583301d258392ef291a57abeca266 \ 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 727787426e..0b10ed2ae3 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 @@ -e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 \ No newline at end of file +c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85 \ 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 9c2fe24fbc..4f80ead132 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 @@ -3f39704c9ca7c7c843c26e835dac8242d2fbea2d \ No newline at end of file +a1cac209c7dedafd359f0a91fb3c617dc231d24a \ 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 5b4ebe1115..724a67c3b1 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 @@ -39d2084efa771325cbde99e8772fa026c5a276a9 \ No newline at end of file +2031b2e0f6fef9ac96eb559fa04c49c3c02c914c \ 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 ecd5e0a6a6..6e786f0bc3 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 @@ -9fd23fb5d11f48db3c6617281544330923c0fb4f \ No newline at end of file +db7bc510530e8816732e87bfca63d40a7cdfa2e1 \ 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 dce46fef79..54faff41ad 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 @@ -34119802dd4c3fb18352e9841c78ae89bb9bf8b5 \ No newline at end of file +29721b37a6731490e8d1a1e15518934ea9ad110e \ 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 ca1ee5aaf8..5745484bbc 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 @@ -6085ab7d0fcc015d403fc80ec1919c010d57d7b9 \ No newline at end of file +8f5db28b4b38bf6efbb20560283df89c46fb69a1 \ 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 07b12daa3ce971d98cb3b2fe154611707c4961a5..11a0657daa32d7e82f76799801262742e8382676 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ{Z^2;fsD0`0W=H{Bt8kG%xQvKx6lj$Y6b%} Q04kTDeE}-BXA=RLaNrLYs{jB1 delta 58 zcmZqZU~A}Lo6x~>d2P^v#-6P`j3zt+VV3>Njnl3CR_0k1$%u6tZ@<99n8n6yz@RmK OK`o=!_H<#!nFRoeloWjc 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 f47d1c7676..a2565457e9 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 @@ -7461f44dc8fba16c94aae0b77f90a2c244abbbf3 \ No newline at end of file +1e43898d5c0583301d258392ef291a57abeca266 \ 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 727787426e..0b10ed2ae3 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 @@ -e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 \ No newline at end of file +c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85 \ 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 9c2fe24fbc..4f80ead132 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 @@ -3f39704c9ca7c7c843c26e835dac8242d2fbea2d \ No newline at end of file +a1cac209c7dedafd359f0a91fb3c617dc231d24a \ 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 5b4ebe1115..724a67c3b1 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 @@ -39d2084efa771325cbde99e8772fa026c5a276a9 \ No newline at end of file +2031b2e0f6fef9ac96eb559fa04c49c3c02c914c \ No newline at end of file diff --git a/mono/dis/dump.c b/mono/dis/dump.c index e33c41a576..b041dceee6 100755 --- a/mono/dis/dump.c +++ b/mono/dis/dump.c @@ -899,7 +899,7 @@ handle_enum: } case MONO_TYPE_VALUETYPE: if (m_class_is_enumtype (sig->params [i]->data.klass)) { - type = mono_class_enum_basetype (sig->params [i]->data.klass)->type; + type = mono_class_enum_basetype_internal (sig->params [i]->data.klass)->type; goto handle_enum; } else { g_warning ("generic valutype not handled in custom attr value decoding"); diff --git a/mono/metadata/class-init.c.REMOVED.git-id b/mono/metadata/class-init.c.REMOVED.git-id index 9937f45ecd..533cbf851b 100644 --- a/mono/metadata/class-init.c.REMOVED.git-id +++ b/mono/metadata/class-init.c.REMOVED.git-id @@ -1 +1 @@ -d76f2e3f332d39c102a21e2a1254a64d6e1ace4a \ No newline at end of file +46d49f6e526bdb14c329f92c43d12391d5efb963 \ No newline at end of file diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h index 11fb4af436..59606534c1 100644 --- a/mono/metadata/class-internals.h +++ b/mono/metadata/class-internals.h @@ -1202,6 +1202,9 @@ mono_class_has_variant_generic_params (MonoClass *klass); gboolean mono_class_is_variant_compatible (MonoClass *klass, MonoClass *oklass, gboolean check_for_reference_conv); +mono_bool +mono_class_is_assignable_from_internal (MonoClass *klass, MonoClass *oklass); + gboolean mono_is_corlib_image (MonoImage *image); MonoType* @@ -1433,6 +1436,9 @@ mono_class_contextbound_bit_offset (int* byte_offset_out, guint8* mask_out); gboolean mono_class_init_checked (MonoClass *klass, MonoError *error); +MonoType* +mono_class_enum_basetype_internal (MonoClass *klass); + /*Now that everything has been defined, let's include the inline functions */ #include diff --git a/mono/metadata/class.c.REMOVED.git-id b/mono/metadata/class.c.REMOVED.git-id index 66434e46c3..aa68c63e97 100644 --- a/mono/metadata/class.c.REMOVED.git-id +++ b/mono/metadata/class.c.REMOVED.git-id @@ -1 +1 @@ -bcea1e4c2a0e9cba38437bfafa521f6d88a548f0 \ No newline at end of file +06b1a4e63783d78c067bb06485cfb9c96a6301fc \ No newline at end of file diff --git a/mono/metadata/class.h b/mono/metadata/class.h index 63915e0f92..6a202affa6 100644 --- a/mono/metadata/class.h +++ b/mono/metadata/class.h @@ -123,7 +123,7 @@ MONO_API mono_bool mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc, mono_bool check_interfaces); -MONO_API mono_bool +MONO_API MONO_RT_EXTERNAL_ONLY mono_bool mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass); MONO_API MONO_RT_EXTERNAL_ONLY @@ -152,7 +152,7 @@ MONO_API MONO_RT_EXTERNAL_ONLY mono_bool mono_class_is_enum (MonoClass *klass); -MONO_API MonoType* +MONO_API MONO_RT_EXTERNAL_ONLY MonoType* mono_class_enum_basetype (MonoClass *klass); MONO_API MONO_RT_EXTERNAL_ONLY diff --git a/mono/metadata/custom-attrs.c b/mono/metadata/custom-attrs.c index c9d7c6b662..8c6fa272cd 100644 --- a/mono/metadata/custom-attrs.c +++ b/mono/metadata/custom-attrs.c @@ -348,7 +348,7 @@ handle_enum: } case MONO_TYPE_VALUETYPE: if (m_class_is_enumtype (t->data.klass)) { - type = mono_class_enum_basetype (t->data.klass)->type; + type = mono_class_enum_basetype_internal (t->data.klass)->type; goto handle_enum; } else { MonoClass *k = t->data.klass; @@ -489,7 +489,7 @@ handle_enum: return_val_if_nok (error, NULL); basetype = m_class_get_byval_arg (tklass)->type; if (basetype == MONO_TYPE_VALUETYPE && m_class_is_enumtype (tklass)) - basetype = mono_class_enum_basetype (tklass)->type; + basetype = mono_class_enum_basetype_internal (tklass)->type; if (basetype == MONO_TYPE_GENERICINST) { MonoGenericClass * mgc = m_class_get_byval_arg (tklass)->data.generic_class; @@ -1451,7 +1451,7 @@ mono_custom_attrs_construct_by_type (MonoCustomAttrInfo *cinfo, MonoClass *attr_ for (i = 0; i < cinfo->num_attrs; ++i) { MonoMethod *ctor = cinfo->attrs[i].ctor; g_assert (ctor); - if (mono_class_is_assignable_from (attr_klass, ctor->klass)) + if (mono_class_is_assignable_from_internal (attr_klass, ctor->klass)) n++; } } else { @@ -1463,7 +1463,7 @@ mono_custom_attrs_construct_by_type (MonoCustomAttrInfo *cinfo, MonoClass *attr_ n = 0; for (i = 0; i < cinfo->num_attrs; ++i) { MonoCustomAttrEntry *centry = &cinfo->attrs [i]; - if (!attr_klass || mono_class_is_assignable_from (attr_klass, centry->ctor->klass)) { + if (!attr_klass || mono_class_is_assignable_from_internal (attr_klass, centry->ctor->klass)) { create_custom_attr_into_array (cinfo->image, centry->ctor, centry->data, centry->data_size, result, n, error); goto_if_nok (error, exit); @@ -1913,7 +1913,7 @@ mono_custom_attrs_has_attr (MonoCustomAttrInfo *ainfo, MonoClass *attr_klass) if (centry->ctor == NULL) continue; MonoClass *klass = centry->ctor->klass; - if (klass == attr_klass || mono_class_has_parent (klass, attr_klass) || (MONO_CLASS_IS_INTERFACE (attr_klass) && mono_class_is_assignable_from (attr_klass, klass))) + if (klass == attr_klass || mono_class_has_parent (klass, attr_klass) || (MONO_CLASS_IS_INTERFACE (attr_klass) && mono_class_is_assignable_from_internal (attr_klass, klass))) return TRUE; } return FALSE; @@ -1946,7 +1946,7 @@ mono_custom_attrs_get_attr_checked (MonoCustomAttrInfo *ainfo, MonoClass *attr_k if (centry->ctor == NULL) continue; MonoClass *klass = centry->ctor->klass; - if (attr_klass == klass || mono_class_is_assignable_from (attr_klass, klass)) + if (attr_klass == klass || mono_class_is_assignable_from_internal (attr_klass, klass)) break; } if (centry == NULL) diff --git a/mono/metadata/icall-internals.h b/mono/metadata/icall-internals.h index e8b43538a6..12cfa45f0a 100644 --- a/mono/metadata/icall-internals.h +++ b/mono/metadata/icall-internals.h @@ -65,4 +65,13 @@ guint32 mono_icall_drive_info_get_drive_type (MonoString *root_path_name); #endif /* !G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */ +void* +mono_lookup_internal_call_full (MonoMethod *method, mono_bool *uses_handles, mono_bool *foreign); + +MONO_PAL_API void +mono_add_internal_call_with_flags (const char *name, const void* method, gboolean cooperative); + +MONO_PROFILER_API void +mono_add_internal_call_internal (const char *name, gconstpointer method); + #endif /* __MONO_METADATA_ICALL_INTERNALS_H__ */ diff --git a/mono/metadata/icall.c.REMOVED.git-id b/mono/metadata/icall.c.REMOVED.git-id index bc4b6a87f8..e02363ff0d 100644 --- a/mono/metadata/icall.c.REMOVED.git-id +++ b/mono/metadata/icall.c.REMOVED.git-id @@ -1 +1 @@ -6a77d712779a343504f08609285d7a492cb78597 \ No newline at end of file +8eaf4a87588c100403f0dc44a989b985a320ef28 \ No newline at end of file diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index a887a938c3..d9a206a893 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -1838,7 +1838,7 @@ get_method_constrained (MonoImage *image, MonoMethod *method, MonoClass *constra error_init (error); - if (!mono_class_is_assignable_from (base_class, constrained_class)) { + if (!mono_class_is_assignable_from_internal (base_class, constrained_class)) { char *base_class_name = mono_type_get_full_name (base_class); char *constrained_class_name = mono_type_get_full_name (constrained_class); mono_error_set_invalid_operation (error, "constrained call: %s is not assignable from %s", base_class_name, constrained_class_name); diff --git a/mono/metadata/loader.h b/mono/metadata/loader.h index 085b512b42..bd7803f5df 100644 --- a/mono/metadata/loader.h +++ b/mono/metadata/loader.h @@ -55,15 +55,15 @@ mono_method_get_flags (MonoMethod *method, uint32_t *iflags); MONO_API uint32_t mono_method_get_index (MonoMethod *method); -MONO_API void +MONO_API MONO_RT_EXTERNAL_ONLY void mono_add_internal_call (const char *name, const void* method); +MONO_API MONO_RT_EXTERNAL_ONLY void +mono_dangerous_add_raw_internal_call (const char *name, const void* method); + MONO_API void* mono_lookup_internal_call (MonoMethod *method); -void* -mono_lookup_internal_call_full (MonoMethod *method, mono_bool *uses_handles); - MONO_API const char* mono_lookup_icall_symbol (MonoMethod *m); diff --git a/mono/metadata/marshal-ilgen.c.REMOVED.git-id b/mono/metadata/marshal-ilgen.c.REMOVED.git-id index d02c7ef227..f8e51bfe77 100644 --- a/mono/metadata/marshal-ilgen.c.REMOVED.git-id +++ b/mono/metadata/marshal-ilgen.c.REMOVED.git-id @@ -1 +1 @@ -0851a5b12ca8942603fd018e39a90fdac1454109 \ No newline at end of file +6b5a6b7a20e1058e339eb3ff5811117fd6c8da7c \ No newline at end of file diff --git a/mono/metadata/marshal.c.REMOVED.git-id b/mono/metadata/marshal.c.REMOVED.git-id index 24c0dfd80f..8bcd8f8a04 100644 --- a/mono/metadata/marshal.c.REMOVED.git-id +++ b/mono/metadata/marshal.c.REMOVED.git-id @@ -1 +1 @@ -683582c79fe6e5aa8bedafea63a75054f637c92b \ No newline at end of file +fa37c8c819bf0439d209c38cf5f96d93f98c2386 \ No newline at end of file diff --git a/mono/metadata/metadata.c.REMOVED.git-id b/mono/metadata/metadata.c.REMOVED.git-id index 552ded14ce..6aead65193 100644 --- a/mono/metadata/metadata.c.REMOVED.git-id +++ b/mono/metadata/metadata.c.REMOVED.git-id @@ -1 +1 @@ -20bbcdecd735865a236f0fcd6309a4c18095285e \ No newline at end of file +04468d1600fb87495862f1ac3fc3f0aa0e673090 \ No newline at end of file diff --git a/mono/metadata/object.c.REMOVED.git-id b/mono/metadata/object.c.REMOVED.git-id index 49582b208e..9ee0fc4678 100644 --- a/mono/metadata/object.c.REMOVED.git-id +++ b/mono/metadata/object.c.REMOVED.git-id @@ -1 +1 @@ -4f6a30f08bf6a75757f62af8341d750b41441f67 \ No newline at end of file +ca60c3c56263eeb0c3acd0d0fe12df90568ba022 \ No newline at end of file diff --git a/mono/metadata/pal-icalls.c b/mono/metadata/pal-icalls.c index 1d4cd038d5..99f4ee583e 100644 --- a/mono/metadata/pal-icalls.c +++ b/mono/metadata/pal-icalls.c @@ -11,6 +11,7 @@ #include "pal_io.h" #include "mono/utils/mono-threads-api.h" #include "mono/utils/atomic.h" +#include "mono/metadata/icall-internals.h" #include "pal-icalls.h" @@ -27,10 +28,10 @@ mono_pal_init (void) { volatile static gboolean module_initialized = FALSE; if (mono_atomic_cas_i32 (&module_initialized, TRUE, FALSE) == FALSE) { - mono_add_internal_call ("Interop/Sys::Read", ves_icall_Interop_Sys_Read); + mono_add_internal_call_with_flags ("Interop/Sys::Read", ves_icall_Interop_Sys_Read, TRUE); #if defined(__APPLE__) - mono_add_internal_call ("Interop/RunLoop::CFRunLoopRun", ves_icall_Interop_RunLoop_CFRunLoopRun); + mono_add_internal_call_with_flags ("Interop/RunLoop::CFRunLoopRun", ves_icall_Interop_RunLoop_CFRunLoopRun, TRUE); #endif } diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index 0ed34c1210..2e36b0b666 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -1396,7 +1396,7 @@ mono_get_object_from_blob (MonoDomain *domain, MonoType *type, const char *blob, return_val_if_nok (error, NULL); retval = mono_object_get_data (object); if (m_class_is_enumtype (klass)) - basetype = mono_class_enum_basetype (klass); + basetype = mono_class_enum_basetype_internal (klass); } else { retval = &object; } diff --git a/mono/metadata/sgen-toggleref.c b/mono/metadata/sgen-toggleref.c index 936ac54c31..6aef0b40ed 100644 --- a/mono/metadata/sgen-toggleref.c +++ b/mono/metadata/sgen-toggleref.c @@ -169,6 +169,8 @@ mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref) if (!toggleref_callback) return; + MONO_ENTER_GC_UNSAFE; + SGEN_LOG (4, "Adding toggleref %p %d", object, strong_ref); sgen_gc_lock (); @@ -179,6 +181,8 @@ mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref) ++toggleref_array_size; sgen_gc_unlock (); + + MONO_EXIT_GC_UNSAFE; } /** diff --git a/mono/metadata/sgen-toggleref.h b/mono/metadata/sgen-toggleref.h index d968b6dc35..349aab50b1 100644 --- a/mono/metadata/sgen-toggleref.h +++ b/mono/metadata/sgen-toggleref.h @@ -26,7 +26,7 @@ typedef enum { } MonoToggleRefStatus; MONO_API void mono_gc_toggleref_register_callback (MonoToggleRefStatus (*proccess_toggleref) (MonoObject *obj)); -MONO_API void mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref); +MONO_API MONO_RT_EXTERNAL_ONLY void mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref); MONO_END_DECLS diff --git a/mono/metadata/sre-encode.c b/mono/metadata/sre-encode.c index b1aef64c23..96bdcb2ee1 100644 --- a/mono/metadata/sre-encode.c +++ b/mono/metadata/sre-encode.c @@ -560,7 +560,7 @@ handle_enum: MonoClass *klass = val->vtable->klass; if (m_class_is_enumtype (klass)) { - *ret_type = mono_class_enum_basetype (klass)->type; + *ret_type = mono_class_enum_basetype_internal (klass)->type; goto handle_enum; } else if (mono_is_corlib_image (m_class_get_image (klass)) && strcmp (m_class_get_name_space (klass), "System") == 0 && strcmp (m_class_get_name (klass), "DateTime") == 0) { len = 8; diff --git a/mono/metadata/sre.c.REMOVED.git-id b/mono/metadata/sre.c.REMOVED.git-id index 8198e42c13..e6c946b512 100644 --- a/mono/metadata/sre.c.REMOVED.git-id +++ b/mono/metadata/sre.c.REMOVED.git-id @@ -1 +1 @@ -cf0f2b72994b27812e93ff84a7d58af092888200 \ No newline at end of file +a8c931570e89a5bfc2e85f349c2162d26eb3f2c0 \ No newline at end of file diff --git a/mono/metadata/verify.c.REMOVED.git-id b/mono/metadata/verify.c.REMOVED.git-id index 89a6263e4c..124c822b74 100644 --- a/mono/metadata/verify.c.REMOVED.git-id +++ b/mono/metadata/verify.c.REMOVED.git-id @@ -1 +1 @@ -149519b35396644935e75f23d0b518770facb63e \ No newline at end of file +ac0f0729357361250b5c8e4eb2e9a9311f965f0f \ No newline at end of file diff --git a/mono/metadata/w32file-unix.c.REMOVED.git-id b/mono/metadata/w32file-unix.c.REMOVED.git-id index 52a6f3ccb7..ff0549a89a 100644 --- a/mono/metadata/w32file-unix.c.REMOVED.git-id +++ b/mono/metadata/w32file-unix.c.REMOVED.git-id @@ -1 +1 @@ -622c71c5beca1500ec3039c31189799f1ad2ebe2 \ No newline at end of file +d031bed216d0d175359b356afab000ee125c567d \ No newline at end of file diff --git a/mono/mini/aot-compiler.c.REMOVED.git-id b/mono/mini/aot-compiler.c.REMOVED.git-id index a9dded1c07..1440741523 100644 --- a/mono/mini/aot-compiler.c.REMOVED.git-id +++ b/mono/mini/aot-compiler.c.REMOVED.git-id @@ -1 +1 @@ -ece77a766c2edb261464566d6498fb8961e8a86d \ No newline at end of file +b5e7a3bec5e7b549daa725065330bcb0a16ce79a \ No newline at end of file diff --git a/mono/mini/aot-runtime-wasm.c b/mono/mini/aot-runtime-wasm.c index 399b8794b3..cbfbf05495 100644 --- a/mono/mini/aot-runtime-wasm.c +++ b/mono/mini/aot-runtime-wasm.c @@ -48,7 +48,7 @@ handle_enum: return 'V'; case MONO_TYPE_VALUETYPE: if (m_class_is_enumtype (t->data.klass)) { - t = mono_class_enum_basetype (t->data.klass); + t = mono_class_enum_basetype_internal (t->data.klass); goto handle_enum; } diff --git a/mono/mini/branch-opts.c b/mono/mini/branch-opts.c index feacab3827..f6b9edd0f7 100644 --- a/mono/mini/branch-opts.c +++ b/mono/mini/branch-opts.c @@ -54,7 +54,7 @@ mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, con for (i = 0; i < header->num_clauses; ++i) { clause = &header->clauses [i]; if (MONO_OFFSET_IN_CLAUSE (clause, bb->real_offset)) { - if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE && clause->data.catch_class && mono_class_is_assignable_from (clause->data.catch_class, exclass)) { + if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE && clause->data.catch_class && mono_class_is_assignable_from_internal (clause->data.catch_class, exclass)) { MonoBasicBlock *tbb; /* get the basic block for the handler and diff --git a/mono/mini/debugger-agent.c.REMOVED.git-id b/mono/mini/debugger-agent.c.REMOVED.git-id index 83916434c1..329dfccc0e 100644 --- a/mono/mini/debugger-agent.c.REMOVED.git-id +++ b/mono/mini/debugger-agent.c.REMOVED.git-id @@ -1 +1 @@ -65be6782ad6ac30a8926beb026517429580d596f \ No newline at end of file +c595475b79fef1ad30a051f10f01650b79524be3 \ No newline at end of file diff --git a/mono/mini/dwarfwriter.c b/mono/mini/dwarfwriter.c index cb2e642493..d572b9151e 100644 --- a/mono/mini/dwarfwriter.c +++ b/mono/mini/dwarfwriter.c @@ -967,7 +967,7 @@ emit_class_dwarf_info (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype) g_hash_table_insert (cache, klass, die); if (m_class_is_enumtype (klass)) { - int size = mono_class_value_size (mono_class_from_mono_type (mono_class_enum_basetype (klass)), NULL); + int size = mono_class_value_size (mono_class_from_mono_type (mono_class_enum_basetype_internal (klass)), NULL); emit_label (w, die); @@ -975,7 +975,7 @@ emit_class_dwarf_info (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype) emit_string (w, full_name); emit_uleb128 (w, size); for (k = 0; k < G_N_ELEMENTS (basic_types); ++k) - if (basic_types [k].type == mono_class_enum_basetype (klass)->type) + if (basic_types [k].type == mono_class_enum_basetype_internal (klass)->type) break; g_assert (k < G_N_ELEMENTS (basic_types)); emit_symbol_diff (w, basic_types [k].die_name, ".Ldebug_info_start", 0); @@ -996,7 +996,7 @@ emit_class_dwarf_info (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype) p = mono_class_get_field_default_value (field, &def_type); /* len = */ mono_metadata_decode_blob_size (p, &p); - switch (mono_class_enum_basetype (klass)->type) { + switch (mono_class_enum_basetype_internal (klass)->type) { case MONO_TYPE_U1: case MONO_TYPE_I1: case MONO_TYPE_BOOLEAN: diff --git a/mono/mini/interp/interp-internals.h b/mono/mini/interp/interp-internals.h index b1db90c4c0..93e74ed5bf 100644 --- a/mono/mini/interp/interp-internals.h +++ b/mono/mini/interp/interp-internals.h @@ -208,7 +208,7 @@ enum_type: return MINT_TYPE_O; case MONO_TYPE_VALUETYPE: if (m_class_is_enumtype (type->data.klass)) { - type = mono_class_enum_basetype (type->data.klass); + type = mono_class_enum_basetype_internal (type->data.klass); goto enum_type; } else return MINT_TYPE_VT; diff --git a/mono/mini/interp/interp.c.REMOVED.git-id b/mono/mini/interp/interp.c.REMOVED.git-id index 8f51931483..d915140d6b 100644 --- a/mono/mini/interp/interp.c.REMOVED.git-id +++ b/mono/mini/interp/interp.c.REMOVED.git-id @@ -1 +1 @@ -9602f0f090d055d50702c425cd9854c353288089 \ No newline at end of file +0cdb06c50617b775233a4436d4c697e5f9373d5d \ No newline at end of file diff --git a/mono/mini/interp/transform.c.REMOVED.git-id b/mono/mini/interp/transform.c.REMOVED.git-id index 75325ce9f8..4ce8e5dda2 100644 --- a/mono/mini/interp/transform.c.REMOVED.git-id +++ b/mono/mini/interp/transform.c.REMOVED.git-id @@ -1 +1 @@ -bf983dbc7462d8db220cf3b14b4369b0e28b72a6 \ No newline at end of file +03312eb8ec9889e301ef79a0afc4dfad9afb65de \ No newline at end of file diff --git a/mono/mini/method-to-ir.c.REMOVED.git-id b/mono/mini/method-to-ir.c.REMOVED.git-id index d336f41fd4..2775c72a26 100644 --- a/mono/mini/method-to-ir.c.REMOVED.git-id +++ b/mono/mini/method-to-ir.c.REMOVED.git-id @@ -1 +1 @@ -04ed46d337048ccbd364cc2f24f9e3b0ca3a0a29 \ No newline at end of file +553eed9e186f93fc74e6a7ca8190ca2ade6791ac \ No newline at end of file diff --git a/mono/mini/mini-generic-sharing.c.REMOVED.git-id b/mono/mini/mini-generic-sharing.c.REMOVED.git-id index 2afb093d3e..3917715465 100644 --- a/mono/mini/mini-generic-sharing.c.REMOVED.git-id +++ b/mono/mini/mini-generic-sharing.c.REMOVED.git-id @@ -1 +1 @@ -e95d70c4a30dee531ef9d06bdc74e4ba35b3c899 \ No newline at end of file +609a53a4d5b40362f7fe39ab2f449030d2736aea \ No newline at end of file diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id index bcb8d0d6ed..0d7ffa6c20 100644 --- a/mono/mini/mini-llvm.c.REMOVED.git-id +++ b/mono/mini/mini-llvm.c.REMOVED.git-id @@ -1 +1 @@ -bd8e9cbb9408ac731f568c0518dd2b956e072775 \ No newline at end of file +a12cc5e6f98195ed59dd832b3baf6795757bf368 \ No newline at end of file diff --git a/mono/mini/mini-runtime.c.REMOVED.git-id b/mono/mini/mini-runtime.c.REMOVED.git-id index f0787a4867..8ebfc8439c 100644 --- a/mono/mini/mini-runtime.c.REMOVED.git-id +++ b/mono/mini/mini-runtime.c.REMOVED.git-id @@ -1 +1 @@ -ced583271c5c4e655dbd46bd7b381e31e593f521 \ No newline at end of file +4ffa27c9063cdf3e0d77896d2c842852e9f0c50a \ No newline at end of file diff --git a/mono/mini/mini-s390x.c.REMOVED.git-id b/mono/mini/mini-s390x.c.REMOVED.git-id index 0d01f29281..b02eb92221 100644 --- a/mono/mini/mini-s390x.c.REMOVED.git-id +++ b/mono/mini/mini-s390x.c.REMOVED.git-id @@ -1 +1 @@ -3293b2dfc8d35b4430791eb9b625668fbabf322d \ No newline at end of file +c66d6a485515096ce35adf3da1f12a0c160b0bb3 \ No newline at end of file diff --git a/mono/mini/mini-wasm.c b/mono/mini/mini-wasm.c index bae020a656..5bad6f3c78 100644 --- a/mono/mini/mini-wasm.c +++ b/mono/mini/mini-wasm.c @@ -210,7 +210,7 @@ mono_wasm_set_timeout (int timeout, int id) void mono_arch_register_icall (void) { - mono_add_internal_call ("System.Threading.WasmRuntime::SetTimeout", mono_wasm_set_timeout); + mono_add_internal_call_internal ("System.Threading.WasmRuntime::SetTimeout", mono_wasm_set_timeout); } void diff --git a/mono/mini/mini.c.REMOVED.git-id b/mono/mini/mini.c.REMOVED.git-id index 09d5f6fc93..db083b39d7 100644 --- a/mono/mini/mini.c.REMOVED.git-id +++ b/mono/mini/mini.c.REMOVED.git-id @@ -1 +1 @@ -c1550190786135513e718ba8b6271d86611861f9 \ No newline at end of file +95a16954baa4e86f8b831345b14d2d152ceec11f \ No newline at end of file diff --git a/mono/mini/tasklets.c b/mono/mini/tasklets.c index cde3881e89..37feb280bf 100644 --- a/mono/mini/tasklets.c +++ b/mono/mini/tasklets.c @@ -6,6 +6,7 @@ #include "tasklets.h" #include "mono/metadata/exception.h" #include "mono/metadata/gc-internals.h" +#include "mono/metadata/icall-internals.h" #include "mini.h" #include "mini-runtime.h" @@ -143,11 +144,11 @@ mono_tasklets_init (void) { mono_os_mutex_init_recursive (&tasklets_mutex); - mono_add_internal_call ("Mono.Tasklets.Continuation::alloc", continuation_alloc); - mono_add_internal_call ("Mono.Tasklets.Continuation::free", continuation_free); - mono_add_internal_call ("Mono.Tasklets.Continuation::mark", continuation_mark_frame); - mono_add_internal_call ("Mono.Tasklets.Continuation::store", continuation_store); - mono_add_internal_call ("Mono.Tasklets.Continuation::restore", continuation_restore); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::alloc", continuation_alloc); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::free", continuation_free); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::mark", continuation_mark_frame); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::store", continuation_store); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::restore", continuation_restore); } void @@ -201,11 +202,11 @@ continuation_restore (MonoContinuation *cont, int state) void mono_tasklets_init(void) { - mono_add_internal_call ("Mono.Tasklets.Continuation::alloc", continuation_alloc); - mono_add_internal_call ("Mono.Tasklets.Continuation::free", continuation_free); - mono_add_internal_call ("Mono.Tasklets.Continuation::mark", continuation_mark_frame); - mono_add_internal_call ("Mono.Tasklets.Continuation::store", continuation_store); - mono_add_internal_call ("Mono.Tasklets.Continuation::restore", continuation_restore); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::alloc", continuation_alloc); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::free", continuation_free); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::mark", continuation_mark_frame); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::store", continuation_store); + mono_add_internal_call_internal ("Mono.Tasklets.Continuation::restore", continuation_restore); } #endif diff --git a/mono/mini/version.h b/mono/mini/version.h index 39bd1989ba..ad56d5182a 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/d7dcd45" +#define FULL_VERSION "explicit/7a7768f" diff --git a/mono/profiler/log.c.REMOVED.git-id b/mono/profiler/log.c.REMOVED.git-id index a225e37d47..a1ada224f3 100644 --- a/mono/profiler/log.c.REMOVED.git-id +++ b/mono/profiler/log.c.REMOVED.git-id @@ -1 +1 @@ -a248b0bc22b1bda3ccc785b7a9be156dc1ac3799 \ No newline at end of file +6b6f88d1f40666b792a333eb6f94248292baeaee \ No newline at end of file diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 57ba061c67cf43258e9a507d71e01319f19e7393..40a572bc9fa13ac8e3f961f49684e956ff65d1cb 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aL61p^B!1GCL_!R(7FLEvoB7oXv;bhz2L%8C diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 48434f6715..6e8e3e7e75 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -31f00599305f2986164407653773487d6b4b6413 \ No newline at end of file +bec19c1f4a6990dbecd62e33ceacd8f90eec9a21 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 64123b7ec2..24e8db75b0 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.170\n" +"Project-Id-Version: mono 5.18.0.175\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-10-22 08:12+0000\n" +"POT-Creation-Date: 2018-10-23 08:06+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 9d04dd02acc9e58c97f653e9378b29440d2bddb9..1cf7e9f263a176737d5ea49ca277a0e6ec86fe13 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*^LzpEUXO7Hm6QyYzF{s<_LcP delta 22 ecmaF1gXP%{mJM-J*^LwoEUXNTHm6QyYzF{s$q0J@ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 7e72adf3da..e314874f73 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -f4f705d44e83353a50f50096ab2fe8f11d4f2af5 \ No newline at end of file +3b0a20c296e774df00255359583484e6bd88bdbd \ No newline at end of file