diff --git a/THIRD-PARTY-NOTICES.TXT b/THIRD-PARTY-NOTICES.TXT
index 53855810b5af9f..4b40333f72ce4f 100644
--- a/THIRD-PARTY-NOTICES.TXT
+++ b/THIRD-PARTY-NOTICES.TXT
@@ -480,8 +480,8 @@ Foundation, Inc., Hewlett-Packard Company, Microsoft, nor Digital
Equipment Corporation makes any representations about the
suitability of this software for any purpose."
-License notice for The LLVM Compiler Infrastructure
----------------------------------------------------
+License notice for The LLVM Compiler Infrastructure (Legacy License)
+--------------------------------------------------------------------
Developed by:
@@ -986,8 +986,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-License for remote stack unwind (https://github.com/llvm/llvm-project/blob/main/lldb/source/Symbol/CompactUnwindInfo.cpp)
---------------------------------------
+License notice for The LLVM Project
+-----------------------------------
Copyright 2019 LLVM Project
diff --git a/docs/coding-guidelines/libraries-packaging.md b/docs/coding-guidelines/libraries-packaging.md
index 25a2894cfe9ae5..f7c926890bf8e8 100644
--- a/docs/coding-guidelines/libraries-packaging.md
+++ b/docs/coding-guidelines/libraries-packaging.md
@@ -55,11 +55,47 @@ Packages can include a Markdown Readme file with a short usage documentation. To
The package Readme is displayed on the package details page on [NuGet gallery](https://nuget.org/). You can include the following content in it:
- A description of the package purpose.
+- A list of package key features
+- A code example that demostrates how to use the package.
- Information when package should be used. For example, if the library is included in the shared framework in .NET, but needs to be installed via NuGet on .NET Framework, it should be mentioned.
-- Information on how to get started with the package.
-- Links to related documentation.
- A list of common entry-point types for the package, with links to their API docs under [.NET API Browser](https://learn.microsoft.com/dotnet/api/).
-- A short code example that demostrates the package usage.
+- Links to related documentation.
+- Information about how to provide feedback on the package and contribute to it.
+
+Use the following Markdown template for a package Readme:
+
+```
+## About
+
+
+
+## Key Features
+
+
+
+## How to Use
+
+
+
+## Main Types
+
+
+
+## Additional Documentation
+
+* [Conceptual documentation](...)
+* [API documentation](...)
+
+## Related Packages
+
+
+
+## Feedback & Contributing
+
+
+
+ExamplePackage is released as open source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/runtime).
+```
For a list of supported Markdown features, see [NuGet documentation](https://learn.microsoft.com/nuget/nuget-org/package-readme-on-nuget-org#supported-markdown-features).
diff --git a/docs/project/list-of-diagnostics.md b/docs/project/list-of-diagnostics.md
index 4f78e9e711653d..4b46d49f5813f0 100644
--- a/docs/project/list-of-diagnostics.md
+++ b/docs/project/list-of-diagnostics.md
@@ -142,10 +142,10 @@ The diagnostic id values reserved for .NET Libraries analyzer warnings are `SYSL
| __`SYSLIB1023`__ | Generating more than 6 arguments is not supported |
| __`SYSLIB1024`__ | Argument is using the unsupported out parameter modifier |
| __`SYSLIB1025`__ | Multiple logging methods cannot use the same event name within a class |
-| __`SYSLIB1026`__ | _`SYSLIB1026`-`SYSLIB1029` reserved for logging._ |
-| __`SYSLIB1027`__ | _`SYSLIB1026`-`SYSLIB1029` reserved for logging._ |
-| __`SYSLIB1028`__ | _`SYSLIB1026`-`SYSLIB1029` reserved for logging._ |
-| __`SYSLIB1029`__ | _`SYSLIB1026`-`SYSLIB1029` reserved for logging._ |
+| __`SYSLIB1026`__ | C# language version not supported by the logging source generator. |
+| __`SYSLIB1027`__ | _`SYSLIB1001`-`SYSLIB1029` reserved for logging._ |
+| __`SYSLIB1028`__ | _`SYSLIB1001`-`SYSLIB1029` reserved for logging._ |
+| __`SYSLIB1029`__ | _`SYSLIB1001`-`SYSLIB1029` reserved for logging._ |
| __`SYSLIB1030`__ | JsonSourceGenerator did not generate serialization metadata for type |
| __`SYSLIB1031`__ | JsonSourceGenerator encountered a duplicate JsonTypeInfo property name |
| __`SYSLIB1032`__ | JsonSourceGenerator encountered a context class that is not partial |
@@ -208,7 +208,7 @@ The diagnostic id values reserved for .NET Libraries analyzer warnings are `SYSL
| __`SYSLIB1089`__ | _`SYSLIB1070`-`SYSLIB1089` reserved for System.Runtime.InteropServices.JavaScript.JSImportGenerator._ |
| __`SYSLIB1090`__ | Invalid 'GeneratedComInterfaceAttribute' usage |
| __`SYSLIB1091`__ | Method is declared in different partial declaration than the 'GeneratedComInterface' attribute. |
-| __`SYSLIB1092`__ | 'GenerateComInterfaceAttribute' usage not recommended. See aka.ms/GeneratedComInterfaceUsage for recommended usage. |
+| __`SYSLIB1092`__ | Usage of '[LibraryImport|GeneratedComInterface]' does not follow recommendation. See aka.ms/[LibraryImport|GeneratedComInterface]Usage for best practices. |
| __`SYSLIB1093`__ | Analysis for COM interface generation has failed |
| __`SYSLIB1094`__ | The base COM interface failed to generate source. Code will not be generated for this interface. |
| __`SYSLIB1095`__ | Invalid 'GeneratedComClassAttribute' usage |
@@ -250,7 +250,7 @@ The diagnostic id values reserved for .NET Libraries analyzer warnings are `SYSL
| __`SYSLIB1213`__ | Options validation generator: Member potentially missing enumerable validation. |
| __`SYSLIB1214`__ | Options validation generator: Can't validate constants, static fields or properties. |
| __`SYSLIB1215`__ | Options validation generator: Validation attribute on the member is inaccessible from the validator type. |
-| __`SYSLIB1216`__ | *_`SYSLIB1201`-`SYSLIB1219` reserved for Microsoft.Extensions.Options.SourceGeneration.* |
+| __`SYSLIB1216`__ | C# language version not supported by the options validation source generator. |
| __`SYSLIB1217`__ | *_`SYSLIB1201`-`SYSLIB1219` reserved for Microsoft.Extensions.Options.SourceGeneration.* |
| __`SYSLIB1218`__ | *_`SYSLIB1201`-`SYSLIB1219` reserved for Microsoft.Extensions.Options.SourceGeneration.* |
| __`SYSLIB1219`__ | *_`SYSLIB1201`-`SYSLIB1219` reserved for Microsoft.Extensions.Options.SourceGeneration.* |
@@ -270,3 +270,5 @@ The diagnostic id values reserved for .NET Libraries analyzer warnings are `SYSL
| Suppression ID | Suppressed Diagnostic ID | Description |
| :----------------------- | :----------------------- | :---------- |
| __`SYSLIBSUPPRESS0001`__ | CA1822 | Do not offer to make methods static when the methods need to be instance methods for a custom marshaller shape. |
+| __`SYSLIBSUPPRESS0002`__ | IL2026 | ConfigurationBindingGenerator: suppress RequiresUnreferencedCode diagnostic for binding call that has been intercepted by a generated static variant. |
+| __`SYSLIBSUPPRESS0003`__ | IL3050 | ConfigurationBindingGenerator: suppress RequiresDynamicCode diagnostic for binding call that has been intercepted by a generated static variant. |
diff --git a/docs/workflow/trimming/feature-switches.md b/docs/workflow/trimming/feature-switches.md
index 87d8fa4c5ec425..635187684116b5 100644
--- a/docs/workflow/trimming/feature-switches.md
+++ b/docs/workflow/trimming/feature-switches.md
@@ -13,6 +13,7 @@ configurations but their defaults might vary as any SDK can set the defaults dif
| EnableUnsafeBinaryFormatterSerialization | System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization | BinaryFormatter serialization support is trimmed when set to false |
| EventSourceSupport | System.Diagnostics.Tracing.EventSource.IsSupported | Any EventSource related code or logic is trimmed when set to false |
| InvariantGlobalization | System.Globalization.Invariant | All globalization specific code and data is trimmed when set to true |
+| MetricsSupport | System.Diagnostics.Metrics.Meter.IsSupported | Any Metrics related code or logic is trimmed when set to false |
| PredefinedCulturesOnly | System.Globalization.PredefinedCulturesOnly | Don't allow creating a culture for which the platform does not have data |
| HybridGlobalization | System.Globalization.Hybrid | Properties connected with the mixed: platform-specific + icu-based globalization will be trimmed |
| UseSystemResourceKeys | System.Resources.UseSystemResourceKeys | Any localizable resources for system assemblies is trimmed when set to true |
@@ -27,6 +28,7 @@ configurations but their defaults might vary as any SDK can set the defaults dif
| MetadataUpdaterSupport | System.Reflection.Metadata.MetadataUpdater.IsSupported | Metadata update related code to be trimmed when set to false |
| _EnableConsumingManagedCodeFromNativeHosting | System.Runtime.InteropServices.EnableConsumingManagedCodeFromNativeHosting | Getting a managed function from native hosting is disabled when set to false and related functionality can be trimmed. |
| VerifyDependencyInjectionOpenGenericServiceTrimmability | Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability | When set to true, DependencyInjection will verify trimming annotations applied to open generic services are correct |
+| DisableDependencyInjectionDynamicEngine | Microsoft.Extensions.DependencyInjection.DisableDynamicEngine | When set to true, DependencyInjection will avoid using System.Reflection.Emit when realizing services |
| NullabilityInfoContextSupport | System.Reflection.NullabilityInfoContext.IsSupported | Nullable attributes can be trimmed when set to false |
| DynamicCodeSupport | System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported | Changes RuntimeFeature.IsDynamicCodeSupported to false to allow testing AOT-safe fallback code without publishing for Native AOT. |
| _AggressiveAttributeTrimming | System.AggressiveAttributeTrimming | When set to true, aggressively trims attributes to allow for the most size savings possible, even if it could result in runtime behavior changes |
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 74f6be96543a5e..458b2d756cba9a 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -10,12 +10,18 @@
+
-
+
+
+
+
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 77268ffa7b5d09..eb4151f3a185d6 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -502,7 +502,7 @@
-
+
@@ -512,7 +512,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 76bf5019cd8ed2..9c18388aa5346d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,80 +1,80 @@
-
+
https://github.com/dotnet/icu
- 92124838d3f0efde3ac483a904691a611babb9a0
+ ac7697a28716e68e986d3db72cbc10324f8961fe
-
+
https://github.com/dotnet/msquic
- a880e93af4e50d19110d228e698900c110e2b0e9
+ bbb1252b31e3a194be3163982d972e4583c75476
https://github.com/dotnet/wcf
7f504aabb1988e9a093c1e74d8040bd52feb2f01
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
https://github.com/dotnet/command-line-api
@@ -85,209 +85,209 @@
02fe27cd6a9b001c8feb7938e6ef4b3799745759b
-
+
https://github.com/dotnet/cecil
- 2f4ef297939628143389ddeea569874ded0b1c1b
+ 64a8874f3c485657e732ca56a5f24e2095740103
-
+
https://github.com/dotnet/emsdk
- abfa03c97f4175d4d209435cd0e71f558e36c3fd
+ ae4eaab4a9415d7f87ca7c6dc0b41ea482fa6337
-
+
https://github.com/dotnet/source-build-reference-packages
- 5a1492557c8717b428b69fd4b7ca8c91d5d18cd3
+ 7b55da982fc6e71c1776c4de89111aee0eecb45a
-
+
https://github.com/dotnet/source-build-externals
- de4dda48d0cf31e13182bc24107b2246c61ed483
+ ed17956dbc31097b7ba6a66be086f4a70a97d84f
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/xliff-tasks
- 493329204079519072f0241ed26f692bdee0d60c
+ 194f32828726c3f1f63f79f3dc09b9e99c157b11
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
-
+
https://github.com/dotnet/llvm-project
- 9b77c16a6061fb1160ec12bd307badb4c58dff98
+ 2e6bfc3d59a6c80e3fa90a703e23bd4dab707756
https://github.com/dotnet/runtime
@@ -330,67 +330,67 @@
https://github.com/dotnet/xharness
480b9159eb7e69b182a87581d5a336e97e0b6dae
-
+
https://github.com/dotnet/arcade
- 9b2af35a6702526dc8a7c5fcadcc44efd0dca170
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 068998a5d91f55a619d1d072ab3094dacd5d6a4f
+ 492f7464d31d9599531fab2a67bc2422046f5133
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 068998a5d91f55a619d1d072ab3094dacd5d6a4f
+ 492f7464d31d9599531fab2a67bc2422046f5133
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 068998a5d91f55a619d1d072ab3094dacd5d6a4f
+ 492f7464d31d9599531fab2a67bc2422046f5133
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 068998a5d91f55a619d1d072ab3094dacd5d6a4f
+ 492f7464d31d9599531fab2a67bc2422046f5133
-
+
https://github.com/dotnet/hotreload-utils
- 696312fd2a60671797b12311a4cf387d3cd14dd0
+ 94979ba9c2904e39ddb9aa255a288caacd6ce166
-
+
https://github.com/dotnet/runtime-assets
- 48270e734aa881c737b80c4fe0459e68aaf08ad6
+ 99168dcff56809205e7ef8530d1256f3a07fab1f
-
+
https://github.com/dotnet/roslyn
- 1fd4ff9d594b227baa3fc0962e2251323311ec19
+ 0d735148bbb4cb511be547fbc1db63a2c81a821d
-
+
https://github.com/dotnet/roslyn
- 1fd4ff9d594b227baa3fc0962e2251323311ec19
+ 0d735148bbb4cb511be547fbc1db63a2c81a821d
-
+
https://github.com/dotnet/roslyn
- 1fd4ff9d594b227baa3fc0962e2251323311ec19
+ 0d735148bbb4cb511be547fbc1db63a2c81a821d
-
+
https://github.com/dotnet/roslyn-analyzers
- 755a4f888d64fc7c0f2802adca731f301a53283d
+ 4a7701fd72094614897b33e4cb1d9640c221d862
-
+
https://github.com/dotnet/roslyn-analyzers
- 755a4f888d64fc7c0f2802adca731f301a53283d
+ 4a7701fd72094614897b33e4cb1d9640c221d862
https://github.com/dotnet/sdk
d10b02ae5cc670609d920a672985ed4456bdd6b6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 068998a5d91f55a619d1d072ab3094dacd5d6a4f
+ 492f7464d31d9599531fab2a67bc2422046f5133
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 068998a5d91f55a619d1d072ab3094dacd5d6a4f
+ 492f7464d31d9599531fab2a67bc2422046f5133
@@ -398,5 +398,9 @@
https://github.com/NuGet/NuGet.Client
8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8
+
+ https://github.com/dotnet/installer
+ 46a7370763921ded24dcb70c585ee97883c615d4
+
diff --git a/eng/Versions.props b/eng/Versions.props
index 3cccff5761371c..ef9555ba255cbe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,18 +7,22 @@
0
0
8.0.100
- 7.0.8
+ 7.0.12
6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))
- rc
- 1
- -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)
+ rtm
+
+
+
+ false
+ release
+ -$(PreReleaseVersionLabel)
+ -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)
$(SdkBandVersion)$(WorkloadVersionSuffix)
+
+ false
$(MajorVersion).$(MinorVersion).0.0
-
- false
- release
true
false
@@ -32,17 +36,17 @@
- 3.11.0-beta1.23412.1
- 8.0.0-preview.23412.1
+ 3.11.0-beta1.23472.1
+ 8.0.0-preview.23472.1
- 4.8.0-1.23408.8
- 4.8.0-1.23408.8
- 4.8.0-1.23408.8
+ 4.8.0-3.23501.1
+ 4.8.0-3.23501.1
+ 4.8.0-3.23501.1
8.0.100-preview.7.23329.3
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 2.5.1-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
- 8.0.0-beta.23411.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 2.5.1-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
+ 8.0.0-beta.23463.1
6.0.0-preview.1.102
@@ -106,14 +110,14 @@
8.0.0-rc.1.23406.6
8.0.0-preview.7.23325.2
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
6.0.0
1.1.1
@@ -139,29 +143,29 @@
4.5.0
8.0.0-rc.1.23406.6
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
- 8.0.0-beta.23408.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
+ 8.0.0-beta.23421.1
- 1.0.0-prerelease.23362.5
- 1.0.0-prerelease.23362.5
- 1.0.0-prerelease.23362.5
- 1.0.0-prerelease.23362.5
- 1.0.0-prerelease.23362.5
- 1.0.0-prerelease.23362.5
+ 1.0.0-prerelease.23478.3
+ 1.0.0-prerelease.23478.3
+ 1.0.0-prerelease.23478.3
+ 1.0.0-prerelease.23478.3
+ 1.0.0-prerelease.23478.3
+ 1.0.0-prerelease.23478.3
- 16.11.27-beta1.23180.1
+ 16.11.29-beta1.23404.4
2.0.0-beta4.23307.1
3.0.3
2.1.0
@@ -182,14 +186,14 @@
8.0.0-prerelease.23407.2
8.0.0-prerelease.23407.2
8.0.0-prerelease.23407.2
- 8.0.0-alpha.0.23407.2
+ 8.0.0-alpha.0.23502.1
2.4.2
1.0.0
2.4.5
3.12.0
4.1.0
6.0.0
- 13.0.1
+ 13.0.3
1.0.2
2.0.4
4.18.4
@@ -203,57 +207,58 @@
2.46.3
2.45.0
2.45.0
-
-
1.1.2-beta1.23323.1
- 7.0.0-preview-20221010.1
+ 8.0.0-preview-20230918.1
8.0.0-rc.1.23406.6
- 0.11.4-alpha.23407.2
+ 0.11.4-alpha.23502.1
8.0.0-rc.1.23406.6
- 8.0.0-rc.1.23407.2
+ 8.0.0-rc.2.23468.2
2.2.2
- 8.0.0-alpha.1.23180.2
+ 8.0.0-alpha.1.23468.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
- 8.0.0-rc.1.23411.2
+ 8.0.0-rtm.23477.1
$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)
1.1.87-gba258badda
1.0.0-v3.14.0.5722
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
- 16.0.5-alpha.1.23408.1
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
+ 16.0.5-alpha.1.23472.2
3.1.7
1.0.406601
+
+ 8.0.100-rtm.23478.7
+ $(MicrosoftDotnetSdkInternalVersion)
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index 6e99723945183e..6c65e81925f2a3 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
}
-$dotnetVersions = @('5','6','7')
+$dotnetVersions = @('5','6','7','8')
foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index 8af7d899db1212..d387c7eac95e54 100644
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi
-DotNetVersions=('5' '6' '7')
+DotNetVersions=('5' '6' '7' '8')
for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index a88d643c8a765e..0998e875e5f78d 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -207,6 +207,7 @@ elseif(ILLUMOS)
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
elseif(HAIKU)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+ set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
function(locate_toolchain_exec exec var)
@@ -217,7 +218,6 @@ elseif(HAIKU)
endif()
find_program(EXEC_LOCATION_${exec}
- PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
NAMES
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
"${TOOLSET_PREFIX}${exec}")
diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss
index 858a0b237c62ce..5d892d619398f9 100644
Binary files a/eng/common/loc/P22DotNetHtmlLocalization.lss and b/eng/common/loc/P22DotNetHtmlLocalization.lss differ
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 517401b688bf76..f5c1ec7eafeb28 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
# Set default versions
if [ -z "$majorVersion" ]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
- if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
+ if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
for version in $versions; do
diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh
index aba9fe24028b0f..de1687b2ccbe79 100644
--- a/eng/common/native/init-distro-rid.sh
+++ b/eng/common/native/init-distro-rid.sh
@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
-# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
- local isPortable="$3"
local rootfsDir=""
- if [ "$#" -ge 4 ]; then
- rootfsDir="$4"
+ if [ "$#" -ge 3 ]; then
+ rootfsDir="$3"
fi
if [ -n "${rootfsDir}" ]; then
diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1
new file mode 100644
index 00000000000000..a2e0048770452f
--- /dev/null
+++ b/eng/common/sdl/trim-assets-version.ps1
@@ -0,0 +1,75 @@
+<#
+.SYNOPSIS
+Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.
+
+.PARAMETER InputPath
+Full path to directory where artifact packages are stored
+
+.PARAMETER Recursive
+Search for NuGet packages recursively
+
+#>
+
+Param(
+ [string] $InputPath,
+ [bool] $Recursive = $true
+)
+
+$CliToolName = "Microsoft.DotNet.VersionTools.Cli"
+
+function Install-VersionTools-Cli {
+ param(
+ [Parameter(Mandatory=$true)][string]$Version
+ )
+
+ Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
+ $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
+
+ $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")
+ Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
+}
+
+# -------------------------------------------------------------------
+
+if (!(Test-Path $InputPath)) {
+ Write-Host "Input Path '$InputPath' does not exist"
+ ExitWithExitCode 1
+}
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
+
+# `tools.ps1` checks $ci to perform some actions. Since the SDL
+# scripts don't necessarily execute in the same agent that run the
+# build.ps1/sh script this variable isn't automatically set.
+$ci = $true
+. $PSScriptRoot\..\tools.ps1
+
+try {
+ $dotnetRoot = InitializeDotNetCli -install:$true
+ $dotnet = "$dotnetRoot\dotnet.exe"
+
+ $toolsetVersion = Read-ArcadeSdkVersion
+ Install-VersionTools-Cli -Version $toolsetVersion
+
+ $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
+ if ($null -eq $cliToolFound) {
+ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
+ ExitWithExitCode 1
+ }
+
+ Exec-BlockVerbosely {
+ & "$dotnet" $CliToolName trim-assets-version `
+ --assets-path $InputPath `
+ --recursive $Recursive
+ Exit-IfNZEC "Sdl"
+ }
+}
+catch {
+ Write-Host $_
+ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+ ExitWithExitCode 1
+}
\ No newline at end of file
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 7aabaa18017bf6..7870f93bc17652 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -105,6 +105,11 @@ jobs:
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
checkDownloadedFiles: true
+ - powershell: eng/common/sdl/trim-assets-version.ps1
+ -InputPath $(Build.ArtifactStagingDirectory)\artifacts
+ displayName: Trim the version from the NuGet packages
+ continueOnError: ${{ parameters.sdlContinueOnError }}
+
- powershell: eng/common/sdl/extract-artifact-packages.ps1
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index c9eced9f7df4c6..aa74ab4a81e782 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -671,6 +671,10 @@ function InitializeNativeTools() {
}
}
+function Read-ArcadeSdkVersion() {
+ return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
+}
+
function InitializeToolset() {
if (Test-Path variable:global:_ToolsetBuildProj) {
return $global:_ToolsetBuildProj
@@ -678,7 +682,7 @@ function InitializeToolset() {
$nugetCache = GetNuGetPackageCachePath
- $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
+ $toolsetVersion = Read-ArcadeSdkVersion
$toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
if (Test-Path $toolsetLocationFile) {
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 118601229cf8b7..370e19805cc3a0 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -260,10 +260,4 @@
DependsOnTargets="
ResolveLibrariesRefAssembliesFromLocalBuild;
ResolveLibrariesRuntimeFilesFromLocalBuild" />
-
-
-
- $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', 'runtime.json'))
- $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))
-
diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
index 2f6ca03db863fb..e6e0273bc75c46 100644
--- a/eng/native/configureplatform.cmake
+++ b/eng/native/configureplatform.cmake
@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake)
# If set, indicates that this is not an officially supported release.
# Release branches should set this to false.
-set(PRERELEASE 1)
+set(PRERELEASE 0)
#----------------------------------------
# Detect and set platform variable names
diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml
index 5fb74a3741f413..0e4279a9697b94 100644
--- a/eng/pipelines/common/evaluate-default-paths.yml
+++ b/eng/pipelines/common/evaluate-default-paths.yml
@@ -241,6 +241,7 @@ jobs:
- src/mono/tools/*
- src/mono/wasi/*
- src/mono/wasm/debugger/*
+ - src/mono/wasm/host/*
- src/mono/wasm/Wasm.Build.Tests/*
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}
@@ -258,6 +259,7 @@ jobs:
- eng/testing/workloads-testing.targets
- src/mono/mono/component/mini-wasm-debugger.c
- src/mono/wasm/debugger/*
+ - src/mono/wasm/host/*
- src/mono/wasm/Wasm.Build.Tests/*
- src/mono/nuget/Microsoft.NET.Runtime*
src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/*
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index 41cce9e1534f94..39e7d9b5c53ced 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -68,6 +68,7 @@ jobs:
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-HelixApi-Access
+ - group: AzureDevOps-Artifact-Feeds-Pats
- name: _osParameter
value: -os ${{ parameters.osGroup }}
@@ -144,13 +145,37 @@ jobs:
- ${{ each variable in parameters.variables }}:
- ${{ variable }}
steps:
+ - ${{ if eq(parameters.osGroup, 'windows') }}:
+ - template: /eng/pipelines/common/templates/disable-vsupdate-or-failfast.yml
+
- checkout: self
clean: true
- fetchDepth: $(checkoutFetchDepth)
+ # If running in source build mode, a git stash will be used for the inner clone. Avoid setting a fetch depth,
+ # as a stash of a shallow cloned repo is not currently supported.
+ ${{ if ne(parameters.isSourceBuild, true) }}:
+ fetchDepth: $(checkoutFetchDepth)
- ${{ if and(eq(parameters.isOfficialBuild, true), notin(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator')) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml
+ - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+ - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.hostedOs, 'windows')) }}:
+ - task: Bash@3
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+ arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+ - ${{ else }}:
+ - task: PowerShell@2
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+ arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
- ${{ each monoCrossAOTTargetOS in parameters.monoCrossAOTTargetOS }}:
- task: DownloadPipelineArtifact@2
displayName: Download ${{monoCrossAOTTargetOS}} AOT offset files
diff --git a/eng/pipelines/common/templates/disable-vsupdate-or-failfast.yml b/eng/pipelines/common/templates/disable-vsupdate-or-failfast.yml
new file mode 100644
index 00000000000000..7b9eab0bafdb50
--- /dev/null
+++ b/eng/pipelines/common/templates/disable-vsupdate-or-failfast.yml
@@ -0,0 +1,38 @@
+# This script tries to disable VSIXAutoUpdate. In case an update is seen as already running,
+# it will exit with an error.
+steps:
+ - powershell: |
+ schtasks /change /tn "\Microsoft\VisualStudio\VSIX Auto Update" /disable
+
+ $vswhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
+ if (-not (Test-Path -Path "$vswhere" -PathType Leaf))
+ {
+ Write-Error "Couldn't locate vswhere at $vswhere"
+ exit 1
+ }
+
+ $vsdir = &"$vswhere" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
+ $vsregedit = "$vsdir\Common7\IDE\VsRegEdit.exe"
+
+ if (-not (Test-Path -Path "$vsregedit" ))
+ {
+ Write-Error "VSWhere returned path: $vsdir, but regedit $vsregedit doesn't exist."
+ exit 1
+ }
+
+ Write-Output "VSWhere returned path: $vsdir, using regedit $vsregedit"
+ Write-Output "Disabling updates through VS Registry:"
+
+ &"$vsdir\Common7\IDE\VsRegEdit.exe" set local HKCU ExtensionManager AutomaticallyCheckForUpdates2Override dword 0
+ &"$vsdir\Common7\IDE\VsRegEdit.exe" read local HKCU ExtensionManager AutomaticallyCheckForUpdates2Override dword
+
+ $processes = Get-Process -Name VSIXAutoUpdate -ErrorAction SilentlyContinue
+
+ if ($processes -ne $null -and $processes.Count -gt 0)
+ {
+ Write-Error "VSIXAutoUpdate has already spawned. Failfast to allow retry"
+ exit 1
+ }
+
+ displayName: Disable VSIX updates or fail-fast
+ condition: always()
diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml
index c30ce8597808d8..02242394fba671 100644
--- a/eng/pipelines/common/templates/pipeline-with-resources.yml
+++ b/eng/pipelines/common/templates/pipeline-with-resources.yml
@@ -85,12 +85,12 @@ resources:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
- container: browser_wasm
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20230913040940-1edc1c6
env:
ROOTFS_DIR: /crossrootfs/x64
- container: wasi_wasm
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20230913040940-1edc1c6
env:
ROOTFS_DIR: /crossrootfs/x64
diff --git a/eng/pipelines/common/templates/runtimes/xplat-job.yml b/eng/pipelines/common/templates/runtimes/xplat-job.yml
index 7249125648cf32..f4ac7e82957123 100644
--- a/eng/pipelines/common/templates/runtimes/xplat-job.yml
+++ b/eng/pipelines/common/templates/runtimes/xplat-job.yml
@@ -106,6 +106,9 @@ jobs:
- ${{insert}}: ${{ variable }}
steps:
+ - ${{ if eq(parameters.osGroup, 'windows') }}:
+ - template: /eng/pipelines/common/templates/disable-vsupdate-or-failfast.yml
+
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml
index 99379f80a5d9ce..365c1432aa41a1 100644
--- a/eng/pipelines/coreclr/templates/build-job.yml
+++ b/eng/pipelines/coreclr/templates/build-job.yml
@@ -79,6 +79,8 @@ jobs:
# Variables used by arcade to gather asset manifests
- name: _DotNetPublishToBlobFeed
value: true
+ - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ - group: AzureDevOps-Artifact-Feeds-Pats
- name: officialBuildIdArg
value: ''
- ${{ if eq(parameters.isOfficialBuild, true) }}:
@@ -162,6 +164,24 @@ jobs:
continueOnError: false
condition: and(succeeded(), in(variables['SignType'], 'real', 'test'))
+ - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+ - ${{ if ne(parameters.osGroup, 'windows') }}:
+ - task: Bash@3
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+ arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+ - ${{ if eq(parameters.osGroup, 'windows') }}:
+ - task: PowerShell@2
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+ arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
- ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}:
- script: |
du -sh $(Build.SourcesDirectory)/*
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
index 13d3352393fa7f..c279c318e34d59 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
@@ -193,6 +193,44 @@ jobs:
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(variables['isRollingBuild'], true))
+#
+# CoreCLR NativeAOT checked build and Pri0 tests
+# Only when CoreCLR is changed
+#
+- template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+ buildConfig: Checked
+ platforms:
+ - windows_x64
+ - linux_x64
+ variables:
+ - name: timeoutPerTestInMinutes
+ value: 60
+ - name: timeoutPerTestCollectionInMinutes
+ value: 180
+ jobParameters:
+ timeoutInMinutes: 240
+ nameSuffix: NativeAOT_Pri0
+ buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release
+ extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
+ extraStepsParameters:
+ creator: dotnet-bot
+ testBuildArgs: 'nativeaot /p:IlcUseServerGc=false'
+ liveLibrariesBuildConfig: Release
+ testRunNamePrefixSuffix: NativeAOT_Pri0_$(_BuildConfig)
+ extraVariablesTemplates:
+ - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
+ parameters:
+ testGroup: innerloop
+ liveLibrariesBuildConfig: Release
+ condition: >-
+ or(
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
+ eq(variables['isRollingBuild'], true))
+
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
diff --git a/eng/pipelines/installer/jobs/build-job.yml b/eng/pipelines/installer/jobs/build-job.yml
index 5a0e37157e45c5..1d89cfad70eb20 100644
--- a/eng/pipelines/installer/jobs/build-job.yml
+++ b/eng/pipelines/installer/jobs/build-job.yml
@@ -293,9 +293,30 @@ jobs:
parameters.archType,
parameters.liveLibrariesBuildConfig) }}
steps:
+ - ${{ if eq(parameters.osGroup, 'windows') }}:
+ - template: /eng/pipelines/common/templates/disable-vsupdate-or-failfast.yml
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
+
+ - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+ - ${{ if ne(parameters.osGroup, 'windows') }}:
+ - task: Bash@3
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+ arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+ - ${{ else }}:
+ - task: PowerShell@2
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+ arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml
index 9dea30f61c455d..2448124a7bc62d 100644
--- a/eng/pipelines/libraries/base-job.yml
+++ b/eng/pipelines/libraries/base-job.yml
@@ -48,6 +48,7 @@ jobs:
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-HelixApi-Access
+ - group: AzureDevOps-Artifact-Feeds-Pats
- _buildScriptFileName: build
@@ -136,4 +137,22 @@ jobs:
artifactName: '$(_runtimeArtifactName)'
displayName: '$(runtimeFlavorName) build drop'
+ - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+ - ${{ if ne(parameters.osGroup, 'windows') }}:
+ - task: Bash@3
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+ arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+ - ${{ if eq(parameters.osGroup, 'windows') }}:
+ - task: PowerShell@2
+ displayName: Setup Private Feeds Credentials
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+ arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+ env:
+ Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
- ${{ parameters.steps }}
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 72d8d53cd94ddd..987d7f99c41f4a 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -62,13 +62,13 @@ jobs:
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- SLES.15.Amd64.Open
- (Centos.8.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-helix
- - (Fedora.36.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-helix
+ - (Fedora.38.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
- (Ubuntu.2204.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- SLES.15.Amd64.Open
- - (Fedora.36.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-helix
+ - (Fedora.38.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
- Ubuntu.2204.Amd64.Open
- (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- (Mariner.2.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml
index 6c740e49d04d47..f4f9c45de36e48 100644
--- a/eng/pipelines/libraries/stress/http.yml
+++ b/eng/pipelines/libraries/stress/http.yml
@@ -13,6 +13,7 @@ schedules:
- main
- release/6.0
- release/7.0
+ - release/8.0
variables:
- template: ../variables.yml
diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml
index 791251030f5753..ab93994400d346 100644
--- a/eng/pipelines/libraries/stress/ssl.yml
+++ b/eng/pipelines/libraries/stress/ssl.yml
@@ -13,6 +13,7 @@ schedules:
- main
- release/6.0
- release/7.0
+ - release/8.0
variables:
- template: ../variables.yml
diff --git a/eng/pipelines/runtime-llvm.yml b/eng/pipelines/runtime-llvm.yml
index e31e623a0353c8..9d358e5f793086 100644
--- a/eng/pipelines/runtime-llvm.yml
+++ b/eng/pipelines/runtime-llvm.yml
@@ -119,7 +119,7 @@ extends:
testGroup: innerloop
nameSuffix: AllSubsets_Mono_LLVMAOT
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -138,7 +138,7 @@ extends:
testGroup: innerloop
nameSuffix: AllSubsets_Mono_LLVMAOT
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index 172a40e24d169f..3a9fd8d89ac4b0 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -41,13 +41,13 @@ extends:
# Localization build
#
- # disabled due to https://github.com/dotnet/runtime/issues/90466
- #- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
- # - template: /eng/common/templates/job/onelocbuild.yml
- # parameters:
- # MirrorRepo: runtime
- # LclSource: lclFilesfromPackage
- # LclPackageId: 'LCL-JUNO-PROD-RUNTIME'
+ - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/8.0') }}:
+ - template: /eng/common/templates/job/onelocbuild.yml
+ parameters:
+ MirrorRepo: runtime
+ MirrorBranch: release/8.0
+ LclSource: lclFilesfromPackage
+ LclPackageId: 'LCL-JUNO-PROD-RUNTIME'
#
# Source Index Build
@@ -334,7 +334,7 @@ extends:
runtimeFlavor: mono
jobParameters:
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
nameSuffix: AllSubsets_Mono_LLVMAOT
runtimeVariant: LLVMAOT
isOfficialBuild: ${{ variables.isOfficialBuild }}
diff --git a/eng/pipelines/runtime-wasm-perf.yml b/eng/pipelines/runtime-wasm-perf.yml
index bd6a6d979e3e40..69039fb3e2a473 100644
--- a/eng/pipelines/runtime-wasm-perf.yml
+++ b/eng/pipelines/runtime-wasm-perf.yml
@@ -3,6 +3,7 @@
# UI to this, and thus avoid any scheduled triggers
trigger: none
+pr: none
variables:
- template: /eng/pipelines/common/variables.yml
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 0f1f9610c60349..3aa0b6504819a7 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -556,6 +556,47 @@ extends:
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
alwaysRun: ${{ variables.isRollingBuild }}
+ #
+ # Android devices
+ # Build the whole product using Mono and run libraries tests
+ #
+ - template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+ buildConfig: Release
+ runtimeFlavor: mono
+ platforms:
+ - android_arm
+ - android_arm64
+ variables:
+ # map dependencies variables to local variables
+ - name: librariesContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+ - name: monoContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
+ jobParameters:
+ testGroup: innerloop
+ nameSuffix: AllSubsets_Mono
+ buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:RunSmokeTestsOnly=true /p:EnableAdditionalTimezoneChecks=true
+ timeoutInMinutes: 480
+ condition: >-
+ or(
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+ eq(variables['isRollingBuild'], true))
+ # extra steps, run tests
+ extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+ extraStepsParameters:
+ creator: dotnet-bot
+ testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+ condition: >-
+ or(
+ eq(variables['librariesContainsChange'], true),
+ eq(variables['monoContainsChange'], true),
+ eq(variables['isRollingBuild'], true))
+
#
# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
# Build the whole product using Mono and run libraries tests
@@ -739,7 +780,7 @@ extends:
testGroup: innerloop
nameSuffix: AllSubsets_Mono_LLVMAOT
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -758,7 +799,7 @@ extends:
testGroup: innerloop
nameSuffix: AllSubsets_Mono_LLVMAOT
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -1277,7 +1318,7 @@ extends:
testGroup: innerloop
nameSuffix: AllSubsets_Mono_LLVMAot_RuntimeTests
runtimeVariant: llvmaot
- buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
timeoutInMinutes: 180
condition: >-
diff --git a/eng/testing/ProvisioningVersions.props b/eng/testing/ProvisioningVersions.props
index 251fa2d85d3165..3105078bdc3b59 100644
--- a/eng/testing/ProvisioningVersions.props
+++ b/eng/testing/ProvisioningVersions.props
@@ -44,20 +44,20 @@
-
+ false
true
- 113.0.5672.63
- 1121455
- <_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1121461
+ 115.0.5790.170
+ 1148114
+ <_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1148123
- 113.0.5672.64
- 1121455
- <_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1121477
+ 115.0.5790.171
+ 1148114
+ <_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1148119
diff --git a/eng/testing/tests.ioslike.targets b/eng/testing/tests.ioslike.targets
index 9151c7c7db05e5..f93afcf1dfb31b 100644
--- a/eng/testing/tests.ioslike.targets
+++ b/eng/testing/tests.ioslike.targets
@@ -15,8 +15,8 @@
<_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration)
-
- <_AOTBuildCommand>$(_AOTBuildCommand) /p:XHARNESS_EXECUTION_DIR="$XHARNESS_EXECUTION_DIR" /p:RunAOTCompilation=$(RunAOTCompilation) /p:UseNativeAOTRuntime=$(UseNativeAOTRuntime) /p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:MonoForceInterpreter=$(MonoForceInterpreter) /p:DevTeamProvisioning=$(DevTeamProvisioning) /p:UsePortableRuntimePack=true /p:Configuration=$(Configuration)
+
+ <_AOTBuildCommand>$(_AOTBuildCommand) /p:XHARNESS_EXECUTION_DIR="$XHARNESS_EXECUTION_DIR" /p:RunAOTCompilation=$(RunAOTCompilation) /p:UseNativeAOTRuntime=$(UseNativeAOTRuntime) /p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:MonoForceInterpreter=$(MonoForceInterpreter) /p:MonoEnableLLVM=true /p:DevTeamProvisioning=$(DevTeamProvisioning) /p:UsePortableRuntimePack=true /p:Configuration=$(Configuration)
<_AOTBuildCommand>$(_AOTBuildCommand)
<_ResetSimulatorSwitch Condition="'$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator'">--reset-simulator
diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets
index 2961313c84973d..df5526e3f11583 100644
--- a/eng/testing/workloads-testing.targets
+++ b/eng/testing/workloads-testing.targets
@@ -76,6 +76,7 @@
Command="chmod +x $(_DotNetInstallScriptPath); $(_DotNetInstallCommand)" />
diff --git a/global.json b/global.json
index b4ca83d356c283..2b41b42c3256e6 100644
--- a/global.json
+++ b/global.json
@@ -8,9 +8,9 @@
"dotnet": "8.0.100-preview.7.23376.3"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1",
+ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23463.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
diff --git a/src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs
index dbbb6758593b0c..e3e091bb872a2b 100644
--- a/src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs
+++ b/src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs
@@ -899,13 +899,10 @@ internal enum RefreshMemoryStatus
///
/// This API will only handle configs that could be handled when the runtime is loaded, for example, for configs that don't have any effects on 32-bit systems (like the GCHeapHardLimit* ones), this API will not handle it.
///
- /// As of now, this API is feature preview only and subject to changes as necessary.
- ///
/// If the hard limit is too low. This can happen if the heap hard limit that the refresh will set, either because of new AppData settings or implied by the container memory limit changes, is lower than what is already committed.
/// If the hard limit is invalid. This can happen, for example, with negative heap hard limit percentages.
///
///
- [RequiresPreviewFeatures("RefreshMemoryLimit is in preview.")]
public static void RefreshMemoryLimit()
{
ulong heapHardLimit = (AppContext.GetData("GCHeapHardLimit") as ulong?) ?? ulong.MaxValue;
diff --git a/src/coreclr/debug/createdump/crashinfo.cpp b/src/coreclr/debug/createdump/crashinfo.cpp
index ef903767ba0279..8af6ec4a54f5bd 100644
--- a/src/coreclr/debug/createdump/crashinfo.cpp
+++ b/src/coreclr/debug/createdump/crashinfo.cpp
@@ -195,7 +195,7 @@ CrashInfo::GatherCrashInfo(DumpType dumpType)
return false;
}
// Add the special (fake) memory region for the special diagnostics info
- MemoryRegion special(PF_R, SpecialDiagInfoAddress, SpecialDiagInfoAddress + PAGE_SIZE);
+ MemoryRegion special(PF_R, SpecialDiagInfoAddress, SpecialDiagInfoAddress + SpecialDiagInfoSize);
m_memoryRegions.insert(special);
#ifdef __APPLE__
InitializeOtherMappings();
diff --git a/src/coreclr/debug/createdump/specialdiaginfo.h b/src/coreclr/debug/createdump/specialdiaginfo.h
index 3a04a9f551e6d7..a857129c9c91ff 100644
--- a/src/coreclr/debug/createdump/specialdiaginfo.h
+++ b/src/coreclr/debug/createdump/specialdiaginfo.h
@@ -24,6 +24,8 @@ const uint64_t SpecialDiagInfoAddress = 0x7fff1000;
#endif
#endif
+const uint64_t SpecialDiagInfoSize = 0x1000;
+
struct SpecialDiagInfoHeader
{
char Signature[16];
diff --git a/src/coreclr/debug/daccess/dacdbiimpl.cpp b/src/coreclr/debug/daccess/dacdbiimpl.cpp
index 67d5b1e60d948c..07208001b0c3b8 100644
--- a/src/coreclr/debug/daccess/dacdbiimpl.cpp
+++ b/src/coreclr/debug/daccess/dacdbiimpl.cpp
@@ -7788,8 +7788,9 @@ HRESULT DacStackReferenceWalker::Next(ULONG count, DacGcReference stackRefs[], U
stackRefs[i].i64ExtraData = 0;
const SOSStackRefData &sosStackRef = mList.Get(i);
- if (sosStackRef.Flags & GC_CALL_INTERIOR)
+ if (sosStackRef.Flags & GC_CALL_INTERIOR || sosStackRef.Address == 0)
{
+ // Direct pointer case - interior pointer, Frame ref, or enregistered var.
stackRefs[i].pObject = CLRDATA_ADDRESS_TO_TADDR(sosStackRef.Object) | 1;
}
else
diff --git a/src/coreclr/debug/daccess/request.cpp b/src/coreclr/debug/daccess/request.cpp
index 868593fae4651e..e5cc22d8c708a5 100644
--- a/src/coreclr/debug/daccess/request.cpp
+++ b/src/coreclr/debug/daccess/request.cpp
@@ -135,11 +135,17 @@ BOOL DacValidateEEClass(PTR_EEClass pEEClass)
BOOL DacValidateMethodTable(PTR_MethodTable pMT, BOOL &bIsFree)
{
+ bIsFree = FALSE;
+
+ if ((pMT == NULL) || dac_cast(pMT) == (TADDR)-1)
+ {
+ return FALSE;
+ }
+
// Verify things are right.
BOOL retval = FALSE;
EX_TRY
{
- bIsFree = FALSE;
if (HOST_CDADDR(pMT) == HOST_CDADDR(g_pFreeObjectMethodTable))
{
bIsFree = TRUE;
@@ -182,7 +188,7 @@ BadMethodTable: ;
BOOL DacValidateMD(PTR_MethodDesc pMD)
{
- if (pMD == NULL)
+ if ((pMD == NULL) || dac_cast(pMD) == (TADDR)-1)
{
return FALSE;
}
@@ -2642,8 +2648,7 @@ ClrDataAccess::GetAssemblyLocation(CLRDATA_ADDRESS assembly, int count, _Inout_u
// Turn from bytes to wide characters
if (!pAssembly->GetPEAssembly()->GetPath().IsEmpty())
{
- if (!pAssembly->GetPEAssembly()->GetPath().
- DacGetUnicode(count, location, pNeeded))
+ if (!pAssembly->GetPEAssembly()->GetPath().DacGetUnicode(count, location, pNeeded))
{
hr = E_FAIL;
}
diff --git a/src/coreclr/debug/daccess/stack.cpp b/src/coreclr/debug/daccess/stack.cpp
index 9402d529eb8ea3..6b9f1a491c291c 100644
--- a/src/coreclr/debug/daccess/stack.cpp
+++ b/src/coreclr/debug/daccess/stack.cpp
@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
{
// It turns out we cannot really get rid of this check. Dynamic methods
// (including IL stubs) do not have their local sig's available after JIT time.
- if (!m_methodDesc->IsIL())
+ // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
+ // not have an IL header.
+ COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
+ ? m_methodDesc->GetILHeader()
+ : NULL;
+ if (ilHeader == NULL)
{
*sig = NULL;
*count = 0;
return E_FAIL;
}
- COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
+ COR_ILMETHOD_DECODER methodDecoder(ilHeader);
mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
if (localSig == mdSignatureNil)
diff --git a/src/coreclr/debug/di/process.cpp b/src/coreclr/debug/di/process.cpp
index eb0f4ad5f1c262..db8f2a4badd67f 100644
--- a/src/coreclr/debug/di/process.cpp
+++ b/src/coreclr/debug/di/process.cpp
@@ -180,7 +180,11 @@ STDAPI DLLEXPORT OpenVirtualProcessImpl2(
IUnknown ** ppInstance,
CLR_DEBUGGING_PROCESS_FLAGS* pFlagsOut)
{
+#ifdef TARGET_WINDOWS
+ HMODULE hDac = LoadLibraryExW(pDacModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+#else
HMODULE hDac = LoadLibraryW(pDacModulePath);
+#endif // !TARGET_WINDOWS
if (hDac == NULL)
{
return HRESULT_FROM_WIN32(GetLastError());
diff --git a/src/coreclr/debug/di/rsclass.cpp b/src/coreclr/debug/di/rsclass.cpp
index ec52823c07af5f..55f83b48a6d211 100644
--- a/src/coreclr/debug/di/rsclass.cpp
+++ b/src/coreclr/debug/di/rsclass.cpp
@@ -132,6 +132,7 @@ HRESULT CordbClass::GetStaticFieldValue(mdFieldDef fieldDef,
IMetaDataImport * pImport = NULL;
EX_TRY
{
+ RSLockHolder lockHolder(GetProcess()->GetProcessLock());
pImport = GetModule()->GetMetaDataImporter(); // throws
// Validate the token.
@@ -1191,4 +1192,3 @@ HRESULT CordbClass::SearchFieldInfo(
// Well, the field doesn't even belong to this class...
ThrowHR(E_INVALIDARG);
}
-
diff --git a/src/coreclr/debug/ee/functioninfo.cpp b/src/coreclr/debug/ee/functioninfo.cpp
index 19910c6429a9c6..6eaa02d2c6de6f 100644
--- a/src/coreclr/debug/ee/functioninfo.cpp
+++ b/src/coreclr/debug/ee/functioninfo.cpp
@@ -1575,7 +1575,11 @@ DebuggerJitInfo *DebuggerMethodInfo::FindOrCreateInitAndAddJitInfo(MethodDesc* f
if (startAddr == NULL)
{
startAddr = g_pEEInterface->GetFunctionAddress(fd);
- _ASSERTE(startAddr != NULL);
+ if (startAddr == NULL)
+ {
+ //The only case this should happen is if we are trying to get the DJI for a method that has not been jitted yet.
+ return NULL;
+ }
}
else
{
diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp
index 02a9b8f26c2f56..7351954070725e 100644
--- a/src/coreclr/gc/gc.cpp
+++ b/src/coreclr/gc/gc.cpp
@@ -823,6 +823,11 @@ class t_join
join_struct.r_join_lock = n_th;
}
+ int get_num_threads()
+ {
+ return join_struct.n_threads;
+ }
+
void destroy ()
{
dprintf (JOIN_LOG, ("Destroying join structure"));
@@ -887,6 +892,8 @@ class t_join
// avoid race due to the thread about to reset the event (occasionally) being preempted before ResetEvent()
if (color == join_struct.lock_color.LoadWithoutBarrier())
{
+ dprintf (9999, ("---h%d %d j%d %d - respin!!! (c:%d-%d)",
+ gch->heap_number, join_id, join_struct.n_threads, color, join_struct.lock_color.LoadWithoutBarrier()));
goto respin;
}
@@ -1117,6 +1124,25 @@ t_join bgc_t_join;
} \
}
+#define spin_and_wait(count_to_spin, expr) \
+{ \
+ while (!expr) \
+ { \
+ for (int j = 0; j < count_to_spin; j++) \
+ { \
+ if (expr) \
+ { \
+ break; \
+ } \
+ YieldProcessor (); \
+ } \
+ if (!(expr)) \
+ { \
+ GCToOSInterface::YieldThread (0); \
+ } \
+ } \
+}
+
#ifdef BACKGROUND_GC
#define max_pending_allocs 64
@@ -1429,8 +1455,6 @@ enter_msl_status gc_heap::enter_spin_lock_msl_helper (GCSpinLock* msl)
{
#ifdef DYNAMIC_HEAP_COUNT
uint64_t start = GetHighPrecisionTimeStamp();
-
- msl->msl_wait_count++;
#endif //DYNAMIC_HEAP_COUNT
unsigned int i = 0;
@@ -1485,7 +1509,7 @@ enter_msl_status gc_heap::enter_spin_lock_msl_helper (GCSpinLock* msl)
#ifdef DYNAMIC_HEAP_COUNT
uint64_t end = GetHighPrecisionTimeStamp();
Interlocked::ExchangeAdd64 (&msl->msl_wait_time, end - start);
- dprintf (6666, ("wait for msl lock total time: %zd, total count: %zd, this time: %zd, this count: %u", msl->msl_wait_time, msl->msl_wait_count, end - start, i));
+ dprintf (3, ("h%d wait for msl lock wait time %zd, total wait time: %zd", heap_number, (end - start), msl->msl_wait_time));
#endif //DYNAMIC_HEAP_COUNT
}
while (Interlocked::CompareExchange (&msl->lock, lock_taken, lock_free) != lock_free);
@@ -2318,9 +2342,6 @@ sorted_table* gc_heap::seg_table;
#ifdef MULTIPLE_HEAPS
GCEvent gc_heap::ee_suspend_event;
-#ifdef DYNAMIC_HEAP_COUNT
-GCEvent gc_heap::gc_idle_thread_event;
-#endif //DYNAMIC_HEAP_COUNT
size_t gc_heap::min_gen0_balance_delta = 0;
size_t gc_heap::min_balance_threshold = 0;
#endif //MULTIPLE_HEAPS
@@ -2919,6 +2940,12 @@ BOOL gc_heap::should_expand_in_full_gc = FALSE;
#ifdef DYNAMIC_HEAP_COUNT
int gc_heap::dynamic_adaptation_mode = dynamic_adaptation_default;
gc_heap::dynamic_heap_count_data_t SVR::gc_heap::dynamic_heap_count_data;
+uint64_t gc_heap::last_suspended_end_time = 0;
+size_t gc_heap::gc_index_full_gc_end = 0;
+
+#ifdef STRESS_DYNAMIC_HEAP_COUNT
+int gc_heap::heaps_in_this_gc = 0;
+#endif //STRESS_DYNAMIC_HEAP_COUNT
#endif // DYNAMIC_HEAP_COUNT
// Provisional mode related stuff.
@@ -6967,12 +6994,6 @@ BOOL gc_heap::create_thread_support (int number_of_heaps)
{
goto cleanup;
}
-#ifdef DYNAMIC_HEAP_COUNT
- if (!gc_idle_thread_event.CreateOSManualEventNoThrow (FALSE))
- {
- goto cleanup;
- }
-#endif //DYNAMIC_HEAP_COUNT
if (!ee_suspend_event.CreateOSAutoEventNoThrow (FALSE))
{
goto cleanup;
@@ -7020,10 +7041,6 @@ bool gc_heap::create_gc_thread ()
return GCToEEInterface::CreateThread(gc_thread_stub, this, false, ".NET Server GC");
}
-#ifdef DYNAMIC_HEAP_COUNT
-static size_t prev_change_heap_count_gc_index;
-#endif //DYNAMIC_HEAP_COUNT
-
#ifdef _MSC_VER
#pragma warning(disable:4715) //IA64 xcompiler recognizes that without the 'break;' the while(1) will never end and therefore not return a value for that code path
#endif //_MSC_VER
@@ -7042,18 +7059,87 @@ void gc_heap::gc_thread_function ()
if (heap_number == 0)
{
- uint32_t wait_result = gc_heap::ee_suspend_event.Wait(gradual_decommit_in_progress_p ? DECOMMIT_TIME_STEP_MILLISECONDS : INFINITE, FALSE);
+ bool wait_on_time_out_p = gradual_decommit_in_progress_p;
+ uint32_t wait_time = DECOMMIT_TIME_STEP_MILLISECONDS;
+#ifdef DYNAMIC_HEAP_COUNT
+ // background_running_p can only change from false to true during suspension.
+ if (!gc_heap::background_running_p () && dynamic_heap_count_data.should_change_heap_count)
+ {
+ assert (dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes);
+
+ dynamic_heap_count_data_t::sample& sample = dynamic_heap_count_data.samples[dynamic_heap_count_data.sample_index];
+ wait_time = min (wait_time, (uint32_t)(sample.elapsed_between_gcs / 1000 / 3));
+ wait_time = max (wait_time, 1);
+
+ dprintf (6666, ("gc#0 thread waiting for %d ms (betwen GCs %I64d)", wait_time, sample.elapsed_between_gcs));
+ }
+#endif //DYNAMIC_HEAP_COUNT
+ uint32_t wait_result = gc_heap::ee_suspend_event.Wait(wait_on_time_out_p ? wait_time : INFINITE, FALSE);
+ dprintf (9999, ("waiting for ee done res %d (timeout %d, %I64d ms since last suspend end)(should_change_heap_count is %d) (gradual_decommit_in_progress_p %d)",
+ wait_result, wait_time, ((GetHighPrecisionTimeStamp() - last_suspended_end_time) / 1000),
+ dynamic_heap_count_data.should_change_heap_count, gradual_decommit_in_progress_p));
if (wait_result == WAIT_TIMEOUT)
{
- decommit_lock.Enter();
- gradual_decommit_in_progress_p = decommit_step (DECOMMIT_TIME_STEP_MILLISECONDS);
- decommit_lock.Leave();
+#ifdef DYNAMIC_HEAP_COUNT
+ if (dynamic_heap_count_data.should_change_heap_count)
+ {
+#ifdef BACKGROUND_GC
+ if (!gc_heap::background_running_p ())
+#endif //BACKGROUND_GC
+ {
+ dprintf (6666, ("changing heap count due to timeout"));
+ check_heap_count();
+ }
+ }
+#endif //DYNAMIC_HEAP_COUNT
+
+ if (gradual_decommit_in_progress_p)
+ {
+ decommit_lock.Enter ();
+ gradual_decommit_in_progress_p = decommit_step (DECOMMIT_TIME_STEP_MILLISECONDS);
+ decommit_lock.Leave ();
+ }
continue;
}
+#ifdef DYNAMIC_HEAP_COUNT
+ // We might want to consider also doing this when a BGC finishes.
+ if (dynamic_heap_count_data.should_change_heap_count)
+ {
+#ifdef BACKGROUND_GC
+ if (!gc_heap::background_running_p ())
+#endif //BACKGROUND_GC
+ {
+ // this was a request to do a GC so make sure we follow through with one.
+ dprintf (6666, ("changing heap count at a GC start"));
+ check_heap_count ();
+ }
+ }
+
+ // wait till the threads that should have gone idle at least reached the place where they are about to wait on the idle event.
+ if ((gc_heap::dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes) &&
+ (n_heaps != dynamic_heap_count_data.last_n_heaps))
+ {
+ int spin_count = 1024;
+ int idle_thread_count = n_max_heaps - n_heaps;
+ dprintf (9999, ("heap count changed %d->%d, idle should be %d and is %d", dynamic_heap_count_data.last_n_heaps, n_heaps,
+ idle_thread_count, VolatileLoadWithoutBarrier (&dynamic_heap_count_data.idle_thread_count)));
+ if (idle_thread_count != dynamic_heap_count_data.idle_thread_count)
+ {
+ spin_and_wait (spin_count, (idle_thread_count == dynamic_heap_count_data.idle_thread_count));
+ dprintf (9999, ("heap count changed %d->%d, now idle is %d", dynamic_heap_count_data.last_n_heaps, n_heaps,
+ VolatileLoadWithoutBarrier (&dynamic_heap_count_data.idle_thread_count)));
+ }
+
+ dynamic_heap_count_data.last_n_heaps = n_heaps;
+ }
+#endif //DYNAMIC_HEAP_COUNT
+
suspended_start_time = GetHighPrecisionTimeStamp();
BEGIN_TIMING(suspend_ee_during_log);
+ dprintf (9999, ("h0 suspending EE in GC!"));
GCToEEInterface::SuspendEE(SUSPEND_FOR_GC);
+ dprintf (9999, ("h0 suspended EE in GC!"));
END_TIMING(suspend_ee_during_log);
proceed_with_gc_p = TRUE;
@@ -7067,46 +7153,74 @@ void gc_heap::gc_thread_function ()
{
settings.init_mechanisms();
#ifdef DYNAMIC_HEAP_COUNT
- // make sure the other gc threads cannot see this as a request to change heap count
- // see explanation below about the cases when we return from gc_start_event.Wait
- assert (dynamic_heap_count_data.new_n_heaps == n_heaps);
+ if (gc_heap::dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes)
+ {
+ // make sure the other gc threads cannot see this as a request to change heap count
+ // see explanation below about the cases when we return from gc_start_event.Wait
+ assert (dynamic_heap_count_data.new_n_heaps == n_heaps);
+ }
#endif //DYNAMIC_HEAP_COUNT
+ dprintf (9999, ("GC thread %d setting_gc_start_in_gc(h%d)", heap_number, n_heaps));
gc_start_event.Set();
}
dprintf (3, (ThreadStressLog::gcServerThread0StartMsg(), heap_number));
}
else
{
+ dprintf (9999, ("GC thread %d waiting_for_gc_start(%d)(gc%Id)", heap_number, n_heaps, VolatileLoadWithoutBarrier(&settings.gc_index)));
gc_start_event.Wait(INFINITE, FALSE);
#ifdef DYNAMIC_HEAP_COUNT
- // we have a couple different cases to handle here when we come back from the wait:
- // 1. We are starting a GC. Signaled by dynamic_heap_count_data.new_n_heaps == n_heaps
- // a) We are starting a GC, but this thread is idle. Signaled by n_heaps <= heap_number
- // b) We are starting a GC, and this thread is participating. Signaled by heap_number < n_heaps
- // 2. We are changing heap count. Signaled by dynamic_heap_count_data.new_n_heaps != n_heaps
- // a) We are changing heap count, but this thread is idle. Signaled by n_heaps <= heap_number.
- // b) We are changing heap count, and this thread is participating. Signaled by heap_number < n_heaps.
-
- // check for 1.a) and 2.a) cases above
- if (n_heaps <= heap_number)
- {
- dprintf (2, ("GC thread %d idle", heap_number));
-
- // make sure GC is complete so we know the gc_idle_thread_event has been reset
- g_theGCHeap->WaitUntilGCComplete();
+ dprintf (9999, ("GC thread %d waiting_done_gc_start(%d-%d)(i: %d)(gc%Id)",
+ heap_number, n_heaps, dynamic_heap_count_data.new_n_heaps, dynamic_heap_count_data.init_only_p, VolatileLoadWithoutBarrier (&settings.gc_index)));
+
+ if ((gc_heap::dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes) &&
+ (dynamic_heap_count_data.new_n_heaps != n_heaps))
+ {
+ // The reason why we need to do this is -
+ // + for threads that were participating, we need them to do work for change_heap_count
+ // + for threads that were not participating but will need to participate, we need to make sure they are woken now instead of
+ // randomly sometime later.
+ int old_n_heaps = n_heaps;
+ int new_n_heaps = dynamic_heap_count_data.new_n_heaps;
+ int num_threads_to_wake = max (new_n_heaps, old_n_heaps);
+ if (heap_number < num_threads_to_wake)
+ {
+ dprintf (9999, ("h%d < %d, calling change", heap_number, num_threads_to_wake));
+ change_heap_count (dynamic_heap_count_data.new_n_heaps);
+ if (new_n_heaps < old_n_heaps)
+ {
+ dprintf (9999, ("h%d after change", heap_number));
+ // at the end of change_heap_count we've changed join's heap count to the new one if it's smaller. So we need to make sure
+ // only that many threads will participate in the following GCs.
+ if (heap_number < new_n_heaps)
+ {
+ dprintf (9999, ("h%d < %d participating (dec)", heap_number, new_n_heaps));
+ }
+ else
+ {
+ Interlocked::Increment (&dynamic_heap_count_data.idle_thread_count);
+ dprintf (9999, ("GC thread %d wait_on_idle(%d < %d)(gc%Id), total idle %d", heap_number, old_n_heaps, new_n_heaps,
+ VolatileLoadWithoutBarrier (&settings.gc_index), VolatileLoadWithoutBarrier (&dynamic_heap_count_data.idle_thread_count)));
+ gc_idle_thread_event.Wait (INFINITE, FALSE);
+ dprintf (9999, ("GC thread %d waking_from_idle(%d)(gc%Id) after doing change", heap_number, n_heaps, VolatileLoadWithoutBarrier (&settings.gc_index)));
+ }
+ }
+ else
+ {
+ dprintf (9999, ("h%d < %d participating (inc)", heap_number, new_n_heaps));
+ }
+ }
+ else
+ {
+ Interlocked::Increment (&dynamic_heap_count_data.idle_thread_count);
+ dprintf (9999, ("GC thread %d wait_on_idle(< max %d)(gc%Id), total idle %d", heap_number, num_threads_to_wake,
+ VolatileLoadWithoutBarrier (&settings.gc_index), VolatileLoadWithoutBarrier (&dynamic_heap_count_data.idle_thread_count)));
+ gc_idle_thread_event.Wait (INFINITE, FALSE);
+ dprintf (9999, ("GC thread %d waking_from_idle(%d)(gc%Id)", heap_number, n_heaps, VolatileLoadWithoutBarrier (&settings.gc_index)));
+ }
- // now wait on the gc_idle_thread_event
- gc_idle_thread_event.Wait(INFINITE, FALSE);
- dprintf (2, ("GC thread %d waking from idle", heap_number));
- continue;
- }
- // case 2.b) above: is this a request to change heap count?
- if (dynamic_heap_count_data.new_n_heaps != n_heaps)
- {
- change_heap_count (dynamic_heap_count_data.new_n_heaps);
continue;
}
- // case 1.b) above: we're starting a GC.
#endif //DYNAMIC_HEAP_COUNT
dprintf (3, (ThreadStressLog::gcServerThreadNStartMsg(), heap_number));
}
@@ -7191,10 +7305,6 @@ void gc_heap::gc_thread_function ()
{
gradual_decommit_in_progress_p = decommit_step (DECOMMIT_TIME_STEP_MILLISECONDS);
}
-#ifdef DYNAMIC_HEAP_COUNT
- // check if we should adjust the number of heaps
- check_heap_count();
-#endif //DYNAMIC_HEAP_COUNT
}
else
{
@@ -9955,6 +10065,20 @@ BOOL gc_heap::insert_ro_segment (heap_segment* seg)
return TRUE;
}
+void gc_heap::update_ro_segment (heap_segment* seg, uint8_t* allocated, uint8_t* committed)
+{
+ enter_spin_lock (&gc_heap::gc_lock);
+
+ assert (use_frozen_segments_p);
+ assert (heap_segment_read_only_p (seg));
+ assert (allocated <= committed);
+ assert (committed <= heap_segment_reserved (seg));
+ heap_segment_allocated (seg) = allocated;
+ heap_segment_committed (seg) = committed;
+
+ leave_spin_lock (&gc_heap::gc_lock);
+}
+
// No one is calling this function right now. If this is getting called we need
// to take care of decommitting the mark array for it - we will need to remember
// which portion of the mark array was committed and only decommit that.
@@ -12513,6 +12637,16 @@ void gc_heap::rearrange_uoh_segments()
freeable_uoh_segment = 0;
}
+void gc_heap::delay_free_segments()
+{
+ rearrange_uoh_segments();
+#ifdef BACKGROUND_GC
+ background_delay_delete_uoh_segments();
+ if (!gc_heap::background_running_p())
+ rearrange_small_heap_segments();
+#endif //BACKGROUND_GC
+}
+
#ifndef USE_REGIONS
void gc_heap::rearrange_heap_segments(BOOL compacting)
{
@@ -14846,6 +14980,25 @@ gc_heap::init_gc_heap (int h_number)
gc_done_event_lock = -1;
gc_done_event_set = false;
+#ifdef DYNAMIC_HEAP_COUNT
+ if (h_number != 0)
+ {
+ if (!gc_idle_thread_event.CreateAutoEventNoThrow (FALSE))
+ {
+ return 0;
+ }
+
+#ifdef BACKGROUND_GC
+ if (!bgc_idle_thread_event.CreateAutoEventNoThrow (FALSE))
+ {
+ return 0;
+ }
+#endif //BACKGROUND_GC
+
+ dprintf (9999, ("creating idle events for h%d", h_number));
+ }
+#endif //DYNAMIC_HEAP_COUNT
+
if (!init_dynamic_data())
{
return 0;
@@ -16024,7 +16177,6 @@ void min_fl_list_info::thread_item_no_prev (uint8_t* item)
tail = item;
}
-// This is only implemented for gen2 right now!!!!
// the min_fl_list array is arranged as chunks of n_heaps min_fl_list_info, the 1st chunk corresponds to the 1st bucket,
// and so on.
void allocator::rethread_items (size_t* num_total_fl_items, size_t* num_total_fl_items_rethreaded, gc_heap* current_heap,
@@ -17392,6 +17544,7 @@ BOOL gc_heap::a_fit_free_list_uoh_p (size_t size,
gen_number, align_const);
dd_new_allocation (dynamic_data_of (gen_number)) -= limit;
+ size_t saved_free_list_size = free_list_size;
#ifdef FEATURE_LOH_COMPACTION
if (loh_pad)
{
@@ -17420,7 +17573,7 @@ BOOL gc_heap::a_fit_free_list_uoh_p (size_t size,
{
generation_free_obj_space (gen) += remain_size;
}
- generation_free_list_space (gen) -= free_list_size;
+ generation_free_list_space (gen) -= saved_free_list_size;
assert ((ptrdiff_t)generation_free_list_space (gen) >= 0);
generation_free_list_allocated (gen) += limit;
@@ -21986,11 +22139,70 @@ BOOL gc_heap::should_proceed_with_gc()
void gc_heap::update_end_gc_time_per_heap()
{
+#ifdef DYNAMIC_HEAP_COUNT
+ size_t prev_gen2_end_time = 0;
+ if ((heap_number == 0) && (dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes) && (settings.condemned_generation == max_generation))
+ {
+ dynamic_data* dd = dynamic_data_of (max_generation);
+ prev_gen2_end_time = dd_previous_time_clock (dd) + dd_gc_elapsed_time (dd);;
+ }
+#endif //DYNAMIC_HEAP_COUNT
+
for (int gen_number = 0; gen_number <= settings.condemned_generation; gen_number++)
{
dynamic_data* dd = dynamic_data_of (gen_number);
+
+ if (heap_number == 0)
+ {
+ dprintf (6666, ("prev gen%d GC end time: prev start %I64d + prev gc elapsed %Id = %I64d",
+ gen_number, dd_previous_time_clock (dd), dd_gc_elapsed_time (dd), (dd_previous_time_clock (dd) + dd_gc_elapsed_time (dd))));
+ }
+
dd_gc_elapsed_time (dd) = (size_t)(end_gc_time - dd_time_clock (dd));
+
+ if (heap_number == 0)
+ {
+ dprintf (6666, ("updated NGC%d %Id elapsed time to %I64d - %I64d = %I64d", gen_number, dd_gc_clock (dd), end_gc_time, dd_time_clock (dd), dd_gc_elapsed_time (dd)));
+ }
}
+
+#ifdef DYNAMIC_HEAP_COUNT
+ if ((heap_number == 0) && (dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes))
+ {
+ dynamic_heap_count_data_t::sample& sample = dynamic_heap_count_data.samples[dynamic_heap_count_data.sample_index];
+ sample.elapsed_between_gcs = end_gc_time - last_suspended_end_time;
+ sample.gc_pause_time = dd_gc_elapsed_time (dynamic_data_of (0));
+ sample.msl_wait_time = get_msl_wait_time();
+
+ dprintf (6666, ("sample#%d: this GC end %I64d - last sus end %I64d = %I64d, this GC pause %I64d, msl wait %I64d",
+ dynamic_heap_count_data.sample_index, end_gc_time, last_suspended_end_time, sample.elapsed_between_gcs, sample.gc_pause_time, sample.msl_wait_time));
+
+ last_suspended_end_time = end_gc_time;
+
+ GCEventFireHeapCountSample_V1 (
+ (uint64_t)VolatileLoadWithoutBarrier (&settings.gc_index),
+ sample.elapsed_between_gcs,
+ sample.gc_pause_time,
+ sample.msl_wait_time);
+
+ dynamic_heap_count_data.sample_index = (dynamic_heap_count_data.sample_index + 1) % dynamic_heap_count_data_t::sample_size;
+
+ if (settings.condemned_generation == max_generation)
+ {
+ gc_index_full_gc_end = dd_gc_clock (dynamic_data_of (0));
+ size_t elapsed_between_gen2_gcs = end_gc_time - prev_gen2_end_time;
+ size_t gen2_elapsed_time = sample.gc_pause_time;
+ dynamic_heap_count_data.gen2_gc_percents[dynamic_heap_count_data.gen2_sample_index] = (float)gen2_elapsed_time * 100.0f / elapsed_between_gen2_gcs;
+
+ dprintf (6666, ("gen2 sample#%d: this GC end %I64d - last gen2 end %I64d = %I64d, GC elapsed %I64d, percent %.3f",
+ dynamic_heap_count_data.gen2_sample_index, end_gc_time, prev_gen2_end_time, elapsed_between_gen2_gcs,
+ gen2_elapsed_time, dynamic_heap_count_data.gen2_gc_percents[dynamic_heap_count_data.gen2_sample_index]));
+ dynamic_heap_count_data.gen2_sample_index = (dynamic_heap_count_data.gen2_sample_index + 1) % dynamic_heap_count_data_t::sample_size;
+ }
+
+ calculate_new_heap_count ();
+ }
+#endif //DYNAMIC_HEAP_COUNT
}
void gc_heap::update_end_ngc_time()
@@ -22137,7 +22349,31 @@ void gc_heap::gc1()
{
dynamic_data* dd = dynamic_data_of (n);
end_gc_time = GetHighPrecisionTimeStamp();
+ size_t time_since_last_gen2 = 0;
+
+#ifdef DYNAMIC_HEAP_COUNT
+ if ((heap_number == 0) && (dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes))
+ {
+ time_since_last_gen2 = (size_t)(end_gc_time - (dd_previous_time_clock (dd) + dd_gc_elapsed_time (dd)));
+ dprintf (6666, ("BGC %Id end %I64d - (prev gen2 start %I64d + elapsed %Id = %I64d) = time inbewteen gen2 %Id",
+ dd_gc_clock (dd), end_gc_time, dd_previous_time_clock (dd), dd_gc_elapsed_time (dd), (dd_previous_time_clock (dd) + dd_gc_elapsed_time (dd)), time_since_last_gen2));
+ }
+#endif //DYNAMIC_HEAP_COUNT
+
dd_gc_elapsed_time (dd) = (size_t)(end_gc_time - dd_time_clock (dd));
+#ifdef DYNAMIC_HEAP_COUNT
+ if ((heap_number == 0) && (dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes))
+ {
+ dprintf (6666, ("updating BGC %Id elapsed time to %I64d - %I64d = %I64d", dd_gc_clock (dd), end_gc_time, dd_time_clock (dd), dd_gc_elapsed_time (dd)));
+
+ float bgc_percent = (float)dd_gc_elapsed_time (dd) * 100.0f / (float)time_since_last_gen2;
+ dynamic_heap_count_data.gen2_gc_percents[dynamic_heap_count_data.gen2_sample_index] = bgc_percent;
+ dprintf (6666, ("gen2 sample %d elapsed %Id * 100 / time inbetween gen2 %Id = %.3f",
+ dynamic_heap_count_data.gen2_sample_index, dd_gc_elapsed_time (dd), time_since_last_gen2, bgc_percent));
+ dynamic_heap_count_data.gen2_sample_index = (dynamic_heap_count_data.gen2_sample_index + 1) % dynamic_heap_count_data_t::sample_size;
+ gc_index_full_gc_end = dd_gc_clock (dynamic_data_of (0));
+ }
+#endif //DYNAMIC_HEAP_COUNT
#ifdef HEAP_BALANCE_INSTRUMENTATION
if (heap_number == 0)
@@ -22744,7 +22980,12 @@ void gc_heap::merge_fl_from_other_heaps (int gen_idx, int to_n_heaps, int from_n
assert (free_list_space_decrease <= generation_free_list_space (gen));
generation_free_list_space (gen) -= free_list_space_decrease;
- assert (free_list_space_decrease <= dd_fragmentation (dd));
+ // TODO - I'm seeing for gen2 this is free_list_space_decrease can be a bit larger than frag.
+ // Need to fix this later.
+ if (gen_idx != max_generation)
+ {
+ assert (free_list_space_decrease <= dd_fragmentation (dd));
+ }
size_t free_list_space_increase = 0;
for (int from_hn = 0; from_hn < from_n_heaps; from_hn++)
@@ -23719,9 +23960,6 @@ void gc_heap::garbage_collect (int n)
#ifdef MULTIPLE_HEAPS
gc_start_event.Reset();
-#ifdef DYNAMIC_HEAP_COUNT
- gc_idle_thread_event.Reset();
-#endif //DYNAMIC_HEAP_COUNT
gc_t_join.restart();
#endif //MULTIPLE_HEAPS
}
@@ -23743,6 +23981,9 @@ void gc_heap::garbage_collect (int n)
#endif // STRESS_HEAP
#ifdef MULTIPLE_HEAPS
+#ifdef STRESS_DYNAMIC_HEAP_COUNT
+ Interlocked::Increment (&heaps_in_this_gc);
+#endif //STRESS_DYNAMIC_HEAP_COUNT
//align all heaps on the max generation to condemn
dprintf (3, ("Joining for max generation to condemn"));
condemned_generation_num = generation_to_condemn (n,
@@ -23758,30 +23999,31 @@ void gc_heap::garbage_collect (int n)
#endif //FEATURE_BASICFREEZE
#ifdef MULTIPLE_HEAPS
+#ifdef STRESS_DYNAMIC_HEAP_COUNT
+ dprintf (9999, ("%d heaps, join sees %d, actually joined %d, %d idle threads (%d)",
+ n_heaps, gc_t_join.get_num_threads (), heaps_in_this_gc,
+ VolatileLoadWithoutBarrier(&dynamic_heap_count_data.idle_thread_count), (n_max_heaps - n_heaps)));
+ if (heaps_in_this_gc != n_heaps)
+ {
+ dprintf (9999, ("should have %d heaps but actually have %d!!", n_heaps, heaps_in_this_gc));
+ GCToOSInterface::DebugBreak ();
+ }
+
+ heaps_in_this_gc = 0;
+#endif //STRESS_DYNAMIC_HEAP_COUNT
+
for (int i = 0; i < n_heaps; i++)
{
gc_heap* hp = g_heaps[i];
// check for card table growth
if (g_gc_card_table != hp->card_table)
hp->copy_brick_card_table();
-
- hp->rearrange_uoh_segments();
-#ifdef BACKGROUND_GC
- hp->background_delay_delete_uoh_segments();
- if (!gc_heap::background_running_p())
- hp->rearrange_small_heap_segments();
-#endif //BACKGROUND_GC
+ hp->delay_free_segments();
}
#else //MULTIPLE_HEAPS
if (g_gc_card_table != card_table)
copy_brick_card_table();
-
- rearrange_uoh_segments();
-#ifdef BACKGROUND_GC
- background_delay_delete_uoh_segments();
- if (!gc_heap::background_running_p())
- rearrange_small_heap_segments();
-#endif //BACKGROUND_GC
+ delay_free_segments();
#endif //MULTIPLE_HEAPS
BOOL should_evaluate_elevation = TRUE;
@@ -23868,10 +24110,8 @@ void gc_heap::garbage_collect (int n)
do_pre_gc();
#ifdef MULTIPLE_HEAPS
+ dprintf (9999, ("in GC, resetting gc_start"));
gc_start_event.Reset();
-#ifdef DYNAMIC_HEAP_COUNT
- gc_idle_thread_event.Reset();
-#endif //DYNAMIC_HEAP_COUNT
dprintf(3, ("Starting all gc threads for gc"));
gc_t_join.restart();
#endif //MULTIPLE_HEAPS
@@ -24327,7 +24567,7 @@ void gc_heap::equalize_promoted_bytes(int condemned_gen_number)
// hope is to achieve better work balancing in relocate and compact phases
// this is also used when the heap count changes to balance regions between heaps
int highest_gen_number = ((condemned_gen_number == max_generation) ?
- (total_generation_count - 1) : condemned_gen_number);
+ (total_generation_count - 1) : condemned_gen_number);
int stop_gen_idx = get_stop_generation_index (condemned_gen_number);
for (int gen_idx = highest_gen_number; gen_idx >= stop_gen_idx; gen_idx--)
@@ -25036,285 +25276,332 @@ void gc_heap::recommission_heap()
#endif //RECORD_LOH_STATE
}
-void gc_heap::check_heap_count ()
+float median_of_3 (float a, float b, float c)
+{
+#define compare_and_swap(i, j) \
+ { \
+ if (i < j) \
+ { \
+ float t = i; \
+ i = j; \
+ j = t; \
+ } \
+ }
+ compare_and_swap (b, a);
+ compare_and_swap (c, a);
+ compare_and_swap (c, b);
+#undef compare_and_swap
+ return b;
+}
+
+size_t gc_heap::get_num_completed_gcs ()
{
- dynamic_heap_count_data.new_n_heaps = n_heaps;
+ size_t num_completed_gcs = settings.gc_index;
+#ifdef BACKGROUND_GC
+ if (g_heaps[0]->is_bgc_in_progress ())
+ {
+ num_completed_gcs--;
+ dprintf (6666, ("BGC in prog, completed GCs -> %Id", num_completed_gcs));
+ }
+#endif //BACKGROUND_GC
+
+ return num_completed_gcs;
+}
+
+int gc_heap::calculate_new_heap_count ()
+{
+ assert (dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes);
+
+ size_t num_completed_gcs = get_num_completed_gcs ();
- if (dynamic_adaptation_mode != dynamic_adaptation_to_application_sizes)
+ dprintf (6666, ("current GC %Id(completed: %Id), prev completed GCs %Id, last full GC happened at index %Id",
+ VolatileLoadWithoutBarrier (&settings.gc_index), num_completed_gcs, dynamic_heap_count_data.prev_num_completed_gcs, gc_index_full_gc_end));
+
+ if (num_completed_gcs < (dynamic_heap_count_data.prev_num_completed_gcs + dynamic_heap_count_data_t::sample_size))
{
- return;
+ dprintf (6666, ("not enough GCs, skipping"));
+ return n_heaps;
}
- // we should be calling this only on the main GC thread
- assert (heap_number == 0);
+ float median_gen2_tcp_percent = 0.0f;
+ if (gc_index_full_gc_end >= (settings.gc_index - dynamic_heap_count_data_t::sample_size))
+ {
+ median_gen2_tcp_percent = dynamic_heap_count_data.get_median_gen2_gc_percent ();
+ }
- // acquire data for the current sample
- uint64_t soh_msl_wait_time = 0;
- uint64_t uoh_msl_wait_time = 0;
- size_t allocating_thread_count = 0;
- size_t heap_size = 0;
- for (int i = 0; i < n_heaps; i++)
+ // If there was a blocking gen2 GC, the overhead would be very large and most likely we would not pick it. So we
+ // rely on the gen2 sample's overhead calculated above.
+ float throughput_cost_percents[dynamic_heap_count_data_t::sample_size];
+ for (int i = 0; i < dynamic_heap_count_data_t::sample_size; i++)
{
- gc_heap* hp = g_heaps[i];
+ dynamic_heap_count_data_t::sample& sample = dynamic_heap_count_data.samples[i];
+ throughput_cost_percents[i] = (sample.elapsed_between_gcs ? (((float)sample.msl_wait_time / n_heaps + sample.gc_pause_time) * 100.0f / (float)sample.elapsed_between_gcs) : 0.0f);
+ assert (throughput_cost_percents[i] >= 0.0);
+ if (throughput_cost_percents[i] > 100.0)
+ throughput_cost_percents[i] = 100.0;
+ dprintf (6666, ("sample %d: msl %I64d / %d + pause %I64d / elapsed %I64d = throughput_cost_percent: %.3f", i,
+ sample.msl_wait_time, n_heaps, sample.gc_pause_time, sample.elapsed_between_gcs, throughput_cost_percents[i]));
+ }
- allocating_thread_count += hp->alloc_contexts_used;
+ float median_throughput_cost_percent = median_of_3 (throughput_cost_percents[0], throughput_cost_percents[1], throughput_cost_percents[2]);
- soh_msl_wait_time += hp->more_space_lock_soh.msl_wait_time;
- hp->more_space_lock_soh.msl_wait_time = 0;
- hp->more_space_lock_soh.msl_wait_count = 0;
+ // apply exponential smoothing and use 1/3 for the smoothing factor
+ const float smoothing = 3;
+ float smoothed_median_throughput_cost_percent = dynamic_heap_count_data.smoothed_median_throughput_cost_percent;
+ if (smoothed_median_throughput_cost_percent != 0.0f)
+ {
+ // average it with the previous value
+ smoothed_median_throughput_cost_percent = median_throughput_cost_percent / smoothing + (smoothed_median_throughput_cost_percent / smoothing) * (smoothing - 1);
+ }
+ else
+ {
+ smoothed_median_throughput_cost_percent = median_throughput_cost_percent;
+ }
- uoh_msl_wait_time += hp->more_space_lock_uoh.msl_wait_time;
- hp->more_space_lock_uoh.msl_wait_time = 0;
- hp->more_space_lock_uoh.msl_wait_count = 0;
+ dprintf (6666, ("median tcp: %.3f, smoothed tcp: %.3f, gen2 tcp %.3f(%.3f, %.3f, %.3f)",
+ median_throughput_cost_percent, smoothed_median_throughput_cost_percent, median_gen2_tcp_percent,
+ dynamic_heap_count_data.gen2_gc_percents[0], dynamic_heap_count_data.gen2_gc_percents[1], dynamic_heap_count_data.gen2_gc_percents[2]));
+
+ size_t heap_size = 0;
+ for (int i = 0; i < n_heaps; i++)
+ {
+ gc_heap* hp = g_heaps[i];
for (int gen_idx = 0; gen_idx < total_generation_count; gen_idx++)
{
dynamic_data* dd = hp->dynamic_data_of (gen_idx);
// estimate the size of each generation as the live data size plus the budget
- heap_size += dd_promoted_size (dd) + dd_desired_allocation (dd);
- dprintf (6666, ("h%d g%d promoted: %zd desired allocation: %zd", i, gen_idx, dd_promoted_size (dd), dd_desired_allocation (dd)));
+ heap_size += dd_current_size (dd) + dd_desired_allocation (dd);
+ dprintf (3, ("h%d g%d current: %zd desired allocation: %zd", i, gen_idx, dd_promoted_size (dd), dd_desired_allocation (dd)));
}
}
- dynamic_data* hp0_dd0 = g_heaps[0]->dynamic_data_of (0);
+ // estimate the space cost of adding a heap as the min gen0 budget
+ size_t heap_space_cost_per_heap = dd_min_size (g_heaps[0]->dynamic_data_of (0));
- // persist data for the current sample
- dynamic_heap_count_data_t::sample& sample = dynamic_heap_count_data.samples[dynamic_heap_count_data.sample_index];
+ // compute the % space cost of adding a heap
+ float percent_heap_space_cost_per_heap = heap_space_cost_per_heap * 100.0f / heap_size;
- sample.soh_msl_wait_time = soh_msl_wait_time / n_heaps;
- sample.uoh_msl_wait_time = uoh_msl_wait_time / n_heaps;
- sample.elapsed_between_gcs = dd_time_clock (hp0_dd0) - dd_previous_time_clock (hp0_dd0);
- sample.gc_elapsed_time = dd_gc_elapsed_time (hp0_dd0);
- sample.allocating_thread_count = allocating_thread_count;
- sample.heap_size = heap_size;
+ // compute reasonable step sizes for the heap count
+ //
+ // on the way up, we essentially multiply the heap count by 1.5, so we go 1, 2, 3, 5, 8 ...
+ // we don't go all the way to the number of CPUs, but stay 1 or 2 short
+ int step_up = (n_heaps + 1) / 2;
+ int extra_heaps = 1 + (n_max_heaps >= 32);
+ step_up = min (step_up, n_max_heaps - extra_heaps - n_heaps);
- dprintf (6666, ("sample %d: soh_msl_wait_time: %zd, uoh_msl_wait_time: %zd, elapsed_between_gcs: %zd, gc_elapsed_time: %d, heap_size: %zd MB",
- dynamic_heap_count_data.sample_index,
- sample.soh_msl_wait_time,
- sample.uoh_msl_wait_time,
- sample.elapsed_between_gcs,
- sample.gc_elapsed_time,
- sample.heap_size/(1024*1024)));
+ // on the way down, we essentially divide the heap count by 1.5
+ int step_down = (n_heaps + 1) / 3;
- dynamic_heap_count_data.sample_index = (dynamic_heap_count_data.sample_index + 1) % dynamic_heap_count_data_t::sample_size;
+ // estimate the potential time benefit of going up a step
+ float tcp_reduction_per_step_up = smoothed_median_throughput_cost_percent * step_up / (n_heaps + step_up);
- GCEventFireHeapCountSample_V1(
- sample.gc_elapsed_time,
- sample.soh_msl_wait_time,
- sample.uoh_msl_wait_time,
- sample.elapsed_between_gcs
- );
+ // estimate the potential time cost of going down a step
+ float tcp_increase_per_step_down = smoothed_median_throughput_cost_percent * step_down / (n_heaps - step_down);
+
+ // estimate the potential space cost of going up a step
+ float scp_increase_per_step_up = percent_heap_space_cost_per_heap * step_up;
+
+ // estimate the potential space saving of going down a step
+ float scp_decrease_per_step_down = percent_heap_space_cost_per_heap * step_down;
- if (settings.gc_index < prev_change_heap_count_gc_index + 3)
+ dprintf (6666, ("[CHP] u %d, d %d | space cost %Id / heap %Id(%.2fmb) = scp %.3f (u: %.3f, d: %.3f) | stcp %.3f, u * %.1f = %.3f, d * %.1f = %.3f",
+ step_up, step_down,
+ heap_space_cost_per_heap, heap_size, ((float)heap_size / (float)1000 / (float)1000), percent_heap_space_cost_per_heap,
+ scp_increase_per_step_up, scp_decrease_per_step_down,
+ smoothed_median_throughput_cost_percent,
+ ((float)step_up / (float)(n_heaps + step_up)), tcp_reduction_per_step_up,
+ ((float)step_down / (float)(n_heaps - step_down)), tcp_increase_per_step_down));
+
+#ifdef STRESS_DYNAMIC_HEAP_COUNT
+ // quick hack for initial testing
+ int new_n_heaps = (int)gc_rand::get_rand (n_max_heaps - 1) + 1;
+
+ // if we are adjusting down, make sure we adjust lower than the lowest uoh msl heap
+ if ((new_n_heaps < n_heaps) && (dynamic_heap_count_data.lowest_heap_with_msl_uoh != -1))
{
- // reconsider the decision every few gcs
- return;
+ new_n_heaps = min (dynamic_heap_count_data.lowest_heap_with_msl_uoh, new_n_heaps);
+ new_n_heaps = max (new_n_heaps, 1);
}
-
- if (gc_heap::background_running_p())
+ dprintf (6666, ("stress %d -> %d", n_heaps, new_n_heaps));
+#else //STRESS_DYNAMIC_HEAP_COUNT
+ int new_n_heaps = n_heaps;
+ if (median_throughput_cost_percent > 10.0f)
{
- // can't have background gc running while we change the number of heaps
- // so it's useless to compute a new number of heaps here
+ // ramp up more agressively - use as many heaps as it would take to bring
+ // the tcp down to 5%
+ new_n_heaps = (int)(n_heaps * (median_throughput_cost_percent / 5.0));
+ dprintf (6666, ("[CHP0] tcp %.3f -> %d * %.3f = %d", median_throughput_cost_percent, n_heaps, (median_throughput_cost_percent / 5.0), new_n_heaps));
+ new_n_heaps = min (new_n_heaps, n_max_heaps - extra_heaps);
}
- else
+ // if the median tcp is 10% or less, react slower
+ else if ((smoothed_median_throughput_cost_percent > 5.0f) || (median_gen2_tcp_percent > 10.0f))
{
- // compute the % overhead from msl waiting time and gc time for each of the samples
- float percent_overhead[dynamic_heap_count_data_t::sample_size];
- for (int i = 0; i < dynamic_heap_count_data_t::sample_size; i++)
- {
- dynamic_heap_count_data_t::sample& sample = dynamic_heap_count_data.samples[i];
- uint64_t overhead_time = sample.soh_msl_wait_time + sample.uoh_msl_wait_time + sample.gc_elapsed_time;
- percent_overhead[i] = overhead_time * 100.0f / sample.elapsed_between_gcs;
- if (percent_overhead[i] < 0)
- percent_overhead[i] = 0;
- else if (percent_overhead[i] > 100)
- percent_overhead[i] = 100;
- dprintf (6666, ("sample %d: percent_overhead: %d%%", i, (int)percent_overhead[i]));
- }
- // compute the median of the percent overhead samples
- #define compare_and_swap(i, j) \
- { \
- if (percent_overhead[i] < percent_overhead[j]) \
- { \
- float t = percent_overhead[i]; \
- percent_overhead[i] = percent_overhead[j]; \
- percent_overhead[j] = t; \
- } \
- }
- compare_and_swap (1, 0);
- compare_and_swap (2, 0);
- compare_and_swap (2, 1);
- #undef compare_and_swap
-
- // the middle element is the median overhead percentage
- float median_percent_overhead = percent_overhead[1];
-
- // apply exponential smoothing and use 1/3 for the smoothing factor
- const float smoothing = 3;
- float smoothed_median_percent_overhead = dynamic_heap_count_data.smoothed_median_percent_overhead;
- if (smoothed_median_percent_overhead != 0.0f)
- {
- // average it with the previous value
- smoothed_median_percent_overhead = median_percent_overhead / smoothing + (smoothed_median_percent_overhead / smoothing) * (smoothing - 1);
+ if (smoothed_median_throughput_cost_percent > 5.0f)
+ {
+ dprintf (6666, ("[CHP1] stcp %.3f > 5, %d + %d = %d", smoothed_median_throughput_cost_percent, n_heaps, step_up, (n_heaps + step_up)));
}
else
{
- // first time? initialize to the median
- smoothed_median_percent_overhead = median_percent_overhead;
+ dprintf (6666, ("[CHP2] tcp %.3f > 10, %d + %d = %d", median_gen2_tcp_percent, n_heaps, step_up, (n_heaps + step_up)));
}
+ new_n_heaps += step_up;
+ }
+ // if we can save at least 1% more in time than we spend in space, increase number of heaps
+ else if ((tcp_reduction_per_step_up - scp_increase_per_step_up) >= 1.0f)
+ {
+ dprintf (6666, ("[CHP3] % .3f - % .3f = % .3f, % d + % d = % d",
+ tcp_reduction_per_step_up, scp_increase_per_step_up, (tcp_reduction_per_step_up - scp_increase_per_step_up),
+ n_heaps, step_up, (n_heaps + step_up)));
+ new_n_heaps += step_up;
+ }
+ // if we can save at least 1% more in space than we spend in time, decrease number of heaps
+ else if ((smoothed_median_throughput_cost_percent < 1.0f) &&
+ (median_gen2_tcp_percent < 5.0f) &&
+ ((scp_decrease_per_step_down - tcp_increase_per_step_down) >= 1.0f))
+ {
+ dprintf (6666, ("[CHP4] stcp %.3f tcp %.3f, %.3f - %.3f = %.3f, %d + %d = %d",
+ smoothed_median_throughput_cost_percent, median_gen2_tcp_percent,
+ scp_decrease_per_step_down, tcp_increase_per_step_down, (scp_decrease_per_step_down - tcp_increase_per_step_down),
+ n_heaps, step_up, (n_heaps + step_up)));
+ new_n_heaps -= step_down;
+ }
- dprintf (6666, ("median overhead: %d%% smoothed median overhead: %d%%", (int)(median_percent_overhead*1000), (int)(smoothed_median_percent_overhead*1000)));
-
- // estimate the space cost of adding a heap as the min gen0 size
- size_t heap_space_cost_per_heap = dd_min_size (hp0_dd0);
-
- // compute the % space cost of adding a heap
- float percent_heap_space_cost_per_heap = heap_space_cost_per_heap * 100.0f / heap_size;
-
- // compute reasonable step sizes for the heap count
+ assert (new_n_heaps >= 1);
+ assert (new_n_heaps <= n_max_heaps);
+#endif //STRESS_DYNAMIC_HEAP_COUNT
- // on the way up, we essentially multiply the heap count by 1.5, so we go 1, 2, 3, 5, 8 ...
- // we don't go all the way to the number of CPUs, but stay 1 or 2 short
- int step_up = (n_heaps + 1) / 2;
- int extra_heaps = 1 + (n_max_heaps >= 32);
- step_up = min (step_up, n_max_heaps - extra_heaps - n_heaps);
+ // store data used for decision to emit in ETW event
+ dynamic_heap_count_data.median_throughput_cost_percent = median_throughput_cost_percent;
+ dynamic_heap_count_data.smoothed_median_throughput_cost_percent = smoothed_median_throughput_cost_percent;
+ dynamic_heap_count_data.percent_heap_space_cost_per_heap = percent_heap_space_cost_per_heap;
+ dynamic_heap_count_data.tcp_reduction_per_step_up = tcp_reduction_per_step_up;
+ dynamic_heap_count_data.tcp_increase_per_step_down = tcp_increase_per_step_down;
+ dynamic_heap_count_data.scp_increase_per_step_up = scp_increase_per_step_up;
+ dynamic_heap_count_data.scp_decrease_per_step_down = scp_decrease_per_step_down;
+
+ GCEventFireHeapCountTuning_V1 (
+ (uint16_t)dynamic_heap_count_data.new_n_heaps,
+ (uint64_t)VolatileLoadWithoutBarrier (&settings.gc_index),
+ dynamic_heap_count_data.median_throughput_cost_percent,
+ dynamic_heap_count_data.smoothed_median_throughput_cost_percent,
+ dynamic_heap_count_data.tcp_reduction_per_step_up,
+ dynamic_heap_count_data.tcp_increase_per_step_down,
+ dynamic_heap_count_data.scp_increase_per_step_up,
+ dynamic_heap_count_data.scp_decrease_per_step_down
+ );
- // on the way down, we essentially divide the heap count by 1.5
- int step_down = (n_heaps + 1) / 3;
+ dynamic_heap_count_data.prev_num_completed_gcs = num_completed_gcs;
- // estimate the potential time benefit of going up a step
- float overhead_reduction_per_step_up = smoothed_median_percent_overhead * step_up / (n_heaps + step_up);
+ if (new_n_heaps != n_heaps)
+ {
+ dprintf (6666, ("should change! %d->%d", n_heaps, new_n_heaps));
+ dynamic_heap_count_data.heap_count_to_change_to = new_n_heaps;
+ dynamic_heap_count_data.should_change_heap_count = true;
+ }
- // estimate the potential time cost of going down a step
- float overhead_increase_per_step_down = smoothed_median_percent_overhead * step_down / (n_heaps - step_down);
+ return new_n_heaps;
+}
- // estimate the potential space cost of going up a step
- float space_cost_increase_per_step_up = percent_heap_space_cost_per_heap * step_up;
+void gc_heap::check_heap_count ()
+{
+ dynamic_heap_count_data.new_n_heaps = dynamic_heap_count_data.heap_count_to_change_to;
- // estimate the potential space saving of going down a step
- float space_cost_decrease_per_step_down = percent_heap_space_cost_per_heap * step_down;
+ assert (dynamic_heap_count_data.new_n_heaps != n_heaps);
-#ifdef STRESS_DYNAMIC_HEAP_COUNT
- // quick hack for initial testing
- int new_n_heaps = (int)gc_rand::get_rand (n_max_heaps - 1) + 1;
+ if (dynamic_heap_count_data.new_n_heaps != n_heaps)
+ {
+ dprintf (9999, ("h0 suspending EE in check"));
+ // can't have threads allocating while we change the number of heaps
+ GCToEEInterface::SuspendEE(SUSPEND_FOR_GC_PREP);
+ dprintf (9999, ("h0 suspended EE in check"));
- // if we are adjusting down, make sure we adjust lower than the lowest uoh msl heap
- if ((new_n_heaps < n_heaps) && (dynamic_heap_count_data.lowest_heap_with_msl_uoh != -1))
+#ifdef BACKGROUND_GC
+ if (gc_heap::background_running_p())
{
- new_n_heaps = min (dynamic_heap_count_data.lowest_heap_with_msl_uoh, new_n_heaps);
+ // background GC is running - reset the new heap count
+ dynamic_heap_count_data.new_n_heaps = n_heaps;
+ dprintf (6666, ("can't change heap count! BGC in progress"));
- // but not down to zero, obviously...
- new_n_heaps = max (new_n_heaps, 1);
- }
-#else //STRESS_DYNAMIC_HEAP_COUNT
- int new_n_heaps = n_heaps;
- if (median_percent_overhead > 10.0f)
- {
- // ramp up more agressively - use as many heaps as it would take to bring
- // the overhead down to 5%
- new_n_heaps = (int)(n_heaps * (median_percent_overhead / 5.0));
- new_n_heaps = min (new_n_heaps, n_max_heaps - extra_heaps);
- }
- // if the median overhead is 10% or less, react slower
- else if (smoothed_median_percent_overhead > 5.0f)
- {
- new_n_heaps += step_up;
- }
- // if we can save at least 1% more in time than we spend in space, increase number of heaps
- else if (overhead_reduction_per_step_up - space_cost_increase_per_step_up >= 1.0f)
- {
- new_n_heaps += step_up;
- }
- // if we can save at least 1% more in space than we spend in time, decrease number of heaps
- else if (smoothed_median_percent_overhead < 1.0f && space_cost_decrease_per_step_down - overhead_increase_per_step_down >= 1.0f)
- {
- new_n_heaps -= step_down;
+ GCToEEInterface::RestartEE(TRUE);
}
+#endif //BACKGROUND_GC
+ }
- dprintf (6666, ("or: %d, si: %d, sd: %d, oi: %d => %d -> %d",
- (int)overhead_reduction_per_step_up,
- (int)space_cost_increase_per_step_up,
- (int)space_cost_decrease_per_step_down,
- (int)overhead_increase_per_step_down,
- n_heaps,
- new_n_heaps));
-
- assert (1 <= new_n_heaps);
- assert (new_n_heaps <= n_max_heaps);
-#endif //STRESS_DYNAMIC_HEAP_COUNT
-
- dynamic_heap_count_data.new_n_heaps = new_n_heaps;
-
- // store data used for decision to emit in ETW event
- dynamic_heap_count_data.median_percent_overhead = median_percent_overhead;
- dynamic_heap_count_data.smoothed_median_percent_overhead = smoothed_median_percent_overhead;
- dynamic_heap_count_data.percent_heap_space_cost_per_heap = percent_heap_space_cost_per_heap;
- dynamic_heap_count_data.overhead_reduction_per_step_up = overhead_reduction_per_step_up;
- dynamic_heap_count_data.overhead_increase_per_step_down = overhead_increase_per_step_down;
- dynamic_heap_count_data.space_cost_increase_per_step_up = space_cost_increase_per_step_up;
- dynamic_heap_count_data.space_cost_decrease_per_step_down = space_cost_decrease_per_step_down;
-
- GCEventFireHeapCountTuning_V1(
- (uint16_t)dynamic_heap_count_data.new_n_heaps,
- (uint64_t)VolatileLoad(&settings.gc_index),
- dynamic_heap_count_data.median_percent_overhead,
- dynamic_heap_count_data.smoothed_median_percent_overhead,
- dynamic_heap_count_data.overhead_reduction_per_step_up,
- dynamic_heap_count_data.overhead_increase_per_step_down,
- dynamic_heap_count_data.space_cost_increase_per_step_up,
- dynamic_heap_count_data.space_cost_decrease_per_step_down
- );
-
- if (new_n_heaps != n_heaps)
+ if (dynamic_heap_count_data.new_n_heaps != n_heaps)
+ {
+ dprintf (6666, ("prep to change from %d to %d", n_heaps, dynamic_heap_count_data.new_n_heaps));
+ if (!prepare_to_change_heap_count (dynamic_heap_count_data.new_n_heaps))
{
- // can't have threads allocating while we change the number of heaps
- GCToEEInterface::SuspendEE(SUSPEND_FOR_GC_PREP);
-
- if (gc_heap::background_running_p())
- {
- // background GC is running - reset the new heap count
- dynamic_heap_count_data.new_n_heaps = n_heaps;
-
- GCToEEInterface::RestartEE(TRUE);
- }
+ // we don't have sufficient resources - reset the new heap count
+ dynamic_heap_count_data.new_n_heaps = n_heaps;
}
}
if (dynamic_heap_count_data.new_n_heaps == n_heaps)
{
// heap count stays the same, no work to do
- dprintf (6666, ("heap count stays the same, no work to do %d == %d", dynamic_heap_count_data.new_n_heaps, n_heaps));
+ dynamic_heap_count_data.prev_num_completed_gcs = get_num_completed_gcs ();
+ dynamic_heap_count_data.should_change_heap_count = false;
- // come back after 3 GCs to reconsider
- prev_change_heap_count_gc_index = settings.gc_index;
+ dprintf (6666, ("heap count stays the same %d, no work to do, set prev completed to %Id", dynamic_heap_count_data.new_n_heaps, dynamic_heap_count_data.prev_num_completed_gcs));
return;
}
- if (GCScan::GetGcRuntimeStructuresValid())
+ int new_n_heaps = dynamic_heap_count_data.new_n_heaps;
+
+ assert (!(dynamic_heap_count_data.init_only_p));
+
{
+ // At this point we are guaranteed to be able to change the heap count to the new one.
+ // Change the heap count for joins here because we will need to join new_n_heaps threads together.
+ dprintf (9999, ("changing join hp %d->%d", n_heaps, new_n_heaps));
+ int max_threads_to_wake = max (n_heaps, new_n_heaps);
+ gc_t_join.update_n_threads (max_threads_to_wake);
+
// make sure the other gc threads cannot see this as a request to GC
assert (dynamic_heap_count_data.new_n_heaps != n_heaps);
+
+ if (n_heaps < new_n_heaps)
+ {
+ int saved_idle_thread_count = dynamic_heap_count_data.idle_thread_count;
+ Interlocked::ExchangeAdd (&dynamic_heap_count_data.idle_thread_count, (n_heaps - new_n_heaps));
+ dprintf (9999, ("GC thread %d setting idle events for h%d-h%d, total idle %d -> %d", heap_number, n_heaps, (new_n_heaps - 1),
+ saved_idle_thread_count, VolatileLoadWithoutBarrier (&dynamic_heap_count_data.idle_thread_count)));
+
+ for (int heap_idx = n_heaps; heap_idx < new_n_heaps; heap_idx++)
+ {
+ g_heaps[heap_idx]->gc_idle_thread_event.Set();
+#ifdef BACKGROUND_GC
+ g_heaps[heap_idx]->bgc_idle_thread_event.Set();
+#endif //BACKGROUND_GC
+ }
+ }
+
gc_start_event.Set();
}
int old_n_heaps = n_heaps;
+ (dynamic_heap_count_data.heap_count_change_count)++;
change_heap_count (dynamic_heap_count_data.new_n_heaps);
GCToEEInterface::RestartEE(TRUE);
- prev_change_heap_count_gc_index = settings.gc_index;
+ dprintf (9999, ("h0 restarted EE"));
// we made changes to the heap count that will change the overhead,
// so change the smoothed overhead to reflect that
- int new_n_heaps = n_heaps;
- dynamic_heap_count_data.smoothed_median_percent_overhead = dynamic_heap_count_data.smoothed_median_percent_overhead/new_n_heaps*old_n_heaps;
+ dynamic_heap_count_data.smoothed_median_throughput_cost_percent = dynamic_heap_count_data.smoothed_median_throughput_cost_percent / n_heaps * old_n_heaps;
+
+ dprintf (6666, ("h0 finished changing, set should change to false!"));
+ dynamic_heap_count_data.should_change_heap_count = false;
}
bool gc_heap::prepare_to_change_heap_count (int new_n_heaps)
{
- dprintf (6666, ("trying to change heap count %d -> %d", n_heaps, new_n_heaps));
+ dprintf (9999, ("trying to change heap count %d -> %d", n_heaps, new_n_heaps));
// use this variable for clarity - n_heaps will change during the transition
int old_n_heaps = n_heaps;
@@ -25357,6 +25644,17 @@ bool gc_heap::prepare_to_change_heap_count (int new_n_heaps)
}
}
+ // Before we look at whether we have sufficient regions we should return regions that should be deleted to free
+ // so we don't lose them when we decommission heaps. We could do this for only heaps that we are about
+ // to decomission. But it's better to do this for all heaps because we don't need to worry about adding them to the
+ // heaps remain (freeable uoh/soh regions) and we get rid of regions with the heap_segment_flags_uoh_delete flag
+ // because background_delay_delete_uoh_segments makes the assumption it can't be the start region.
+ for (int i = 0; i < old_n_heaps; i++)
+ {
+ gc_heap* hp = g_heaps[i];
+ hp->delay_free_segments ();
+ }
+
// if we want to increase the number of heaps, we have to make sure we can give
// each heap a region for each generation. If we cannot do that, we have to give up
ptrdiff_t region_count_in_gen[total_generation_count];
@@ -25437,39 +25735,34 @@ bool gc_heap::prepare_to_change_heap_count (int new_n_heaps)
bool gc_heap::change_heap_count (int new_n_heaps)
{
+ dprintf (9999, ("BEG heap%d changing %d->%d", heap_number, n_heaps, new_n_heaps));
+
// use this variable for clarity - n_heaps will change during the transition
int old_n_heaps = n_heaps;
+ bool init_only_p = dynamic_heap_count_data.init_only_p;
- if (heap_number == 0)
- {
- if (!prepare_to_change_heap_count (new_n_heaps))
- {
- // we don't have sufficient resources - reset the new heap count
- dynamic_heap_count_data.new_n_heaps = n_heaps;
- }
- }
-
- if (GCScan::GetGcRuntimeStructuresValid())
{
- // join for sufficient resources decision
gc_t_join.join (this, gc_join_merge_temp_fl);
if (gc_t_join.joined ())
{
+ // BGC is not running, we can safely change its join's heap count.
+#ifdef BACKGROUND_GC
+ bgc_t_join.update_n_threads (new_n_heaps);
+#endif //BACKGROUND_GC
+
+ dynamic_heap_count_data.init_only_p = false;
+ dprintf (9999, ("in change h%d resetting gc_start, update bgc join to %d heaps", heap_number, new_n_heaps));
gc_start_event.Reset();
gc_t_join.restart ();
}
}
- // gc_heap::n_heaps may have changed by now, compare to the snapshot *before* the join
- if (dynamic_heap_count_data.new_n_heaps == old_n_heaps)
- {
- dprintf (6666, ("failed to change heap count, no work to do %d == %d", dynamic_heap_count_data.new_n_heaps, old_n_heaps));
- return false;
- }
+ assert (dynamic_heap_count_data.new_n_heaps != old_n_heaps);
+
+ dprintf (9999, ("Waiting h0 heap%d changing %d->%d", heap_number, n_heaps, new_n_heaps));
if (heap_number == 0)
{
- // after having checked for sufficient resources, we are now committed to actually change the heap count
dprintf (3, ("switching heap count from %d to %d heaps", old_n_heaps, new_n_heaps));
// spread finalization data out to heaps coming into service
@@ -25490,17 +25783,23 @@ bool gc_heap::change_heap_count (int new_n_heaps)
from_heap_number = (from_heap_number + 1) % old_n_heaps;
}
- // prepare for the switch by fixing the allocation contexts on the old heaps,
+ // prepare for the switch by fixing the allocation contexts on the old heaps, unify the gen0_bricks_cleared flag,
// and setting the survived size for the existing regions to their allocated size
+ BOOL unified_gen0_bricks_cleared = TRUE;
for (int i = 0; i < old_n_heaps; i++)
{
gc_heap* hp = g_heaps[i];
- if (GCScan::GetGcRuntimeStructuresValid())
+ if (!init_only_p)
{
hp->fix_allocation_contexts (TRUE);
}
+ if (unified_gen0_bricks_cleared && (hp->gen0_bricks_cleared == FALSE))
+ {
+ unified_gen0_bricks_cleared = FALSE;
+ }
+
for (int gen_idx = 0; gen_idx < total_generation_count; gen_idx++)
{
generation* gen = hp->generation_of (gen_idx);
@@ -25600,7 +25899,7 @@ bool gc_heap::change_heap_count (int new_n_heaps)
hpd->free_regions[kind].transfer_regions(&hp->free_regions[kind]);
}
}
- // update number of heaps
+ dprintf (9999, ("h%d changing %d->%d", heap_number, n_heaps, new_n_heaps));
n_heaps = new_n_heaps;
// even out the regions over the current number of heaps
@@ -25611,6 +25910,8 @@ bool gc_heap::change_heap_count (int new_n_heaps)
{
gc_heap* hp = g_heaps[i];
+ hp->gen0_bricks_cleared = unified_gen0_bricks_cleared;
+
// establish invariants regarding the ephemeral segment
generation* gen0 = hp->generation_of (0);
if ((hp->ephemeral_heap_segment == nullptr) ||
@@ -25639,7 +25940,9 @@ bool gc_heap::change_heap_count (int new_n_heaps)
}
}
- if (GCScan::GetGcRuntimeStructuresValid())
+ dprintf (3, ("individual heap%d changing %d->%d", heap_number, n_heaps, new_n_heaps));
+
+ if (!init_only_p)
{
// join for rethreading the free lists
gc_t_join.join (this, gc_join_merge_temp_fl);
@@ -25651,7 +25954,11 @@ bool gc_heap::change_heap_count (int new_n_heaps)
// rethread the free lists
for (int gen_idx = 0; gen_idx < total_generation_count; gen_idx++)
{
- rethread_fl_items (gen_idx);
+ if (heap_number < old_n_heaps)
+ {
+ dprintf (3, ("h%d calling per heap work!", heap_number));
+ rethread_fl_items (gen_idx);
+ }
// join for merging the free lists
gc_t_join.join (this, gc_join_merge_temp_fl);
@@ -25662,18 +25969,14 @@ bool gc_heap::change_heap_count (int new_n_heaps)
gc_t_join.restart ();
}
}
+#ifdef BACKGROUND_GC
// there should be no items in the bgc_alloc_lock
bgc_alloc_lock->check();
+#endif //BACKGROUND_GC
}
if (heap_number == 0)
{
- // udate the number of heaps in the joins
- gc_t_join.update_n_threads(new_n_heaps);
- #ifdef BACKGROUND_GC
- bgc_t_join.update_n_threads(new_n_heaps);
- #endif //BACKGROUND_GC
-
// compute the total budget per generation over the old heaps
// and figure out what the new budget per heap is
ptrdiff_t budget_per_heap[total_generation_count];
@@ -25733,21 +26036,50 @@ bool gc_heap::change_heap_count (int new_n_heaps)
hp->decommission_heap();
}
- if (GCScan::GetGcRuntimeStructuresValid())
+ if (!init_only_p)
{
// make sure no allocation contexts point to idle heaps
fix_allocation_contexts_heaps();
}
- if (old_n_heaps < new_n_heaps)
+ dynamic_heap_count_data.last_n_heaps = old_n_heaps;
+ }
+
+ // join the last time to change the heap count again if needed.
+ if (new_n_heaps < old_n_heaps)
+ {
+ gc_t_join.join (this, gc_join_merge_temp_fl);
+ if (gc_t_join.joined ())
{
- // wake up threads for the new heaps
- gc_idle_thread_event.Set();
+ dprintf (9999, ("now changing the join heap count to the smaller one %d", new_n_heaps));
+ gc_t_join.update_n_threads (new_n_heaps);
+
+ gc_t_join.restart ();
}
}
return true;
}
+
+size_t gc_heap::get_msl_wait_time()
+{
+ assert (dynamic_adaptation_mode == dynamic_adaptation_to_application_sizes);
+
+ size_t msl_wait_since_pause = 0;
+
+ for (int i = 0; i < n_heaps; i++)
+ {
+ gc_heap* hp = g_heaps[i];
+
+ msl_wait_since_pause += hp->more_space_lock_soh.msl_wait_time;
+ hp->more_space_lock_soh.msl_wait_time = 0;
+
+ msl_wait_since_pause += hp->more_space_lock_uoh.msl_wait_time;
+ hp->more_space_lock_uoh.msl_wait_time = 0;
+ }
+
+ return msl_wait_since_pause;
+}
#endif //DYNAMIC_HEAP_COUNT
#endif //USE_REGIONS
@@ -32791,17 +33123,17 @@ void gc_heap::plan_phase (int condemned_gen_number)
}
else
{
- dprintf (2, ("gen2 didn't grow (end seg alloc: %zd, , condemned alloc: %zd, gen1 c alloc: %zd",
+ dprintf (1, ("gen2 didn't grow (end seg alloc: %zd, , condemned alloc: %zd, gen1 c alloc: %zd",
end_seg_allocated, condemned_allocated,
generation_condemned_allocated (generation_of (max_generation - 1))));
}
- dprintf (1, ("older gen's free alloc: %zd->%zd, seg alloc: %zd->%zd, condemned alloc: %zd->%zd",
+ dprintf (2, ("older gen's free alloc: %zd->%zd, seg alloc: %zd->%zd, condemned alloc: %zd->%zd",
r_older_gen_free_list_allocated, generation_free_list_allocated (older_gen),
r_older_gen_end_seg_allocated, generation_end_seg_allocated (older_gen),
r_older_gen_condemned_allocated, generation_condemned_allocated (older_gen)));
- dprintf (1, ("this GC did %zd free list alloc(%zd bytes free space rejected)",
+ dprintf (2, ("this GC did %zd free list alloc(%zd bytes free space rejected)",
free_list_allocated, rejected_free_space));
maxgen_size_increase* maxgen_size_info = &(get_gc_data_per_heap()->maxgen_size_info);
@@ -38894,9 +39226,9 @@ void gc_heap::bgc_thread_function()
{
// this is the case where we have more background GC threads than heaps
// - wait until we're told to continue...
- dprintf (3, ("BGC thread %d idle", heap_number));
- gc_idle_thread_event.Wait(INFINITE, FALSE);
- dprintf (3, ("BGC thread %d waking from idle", heap_number));
+ dprintf (9999, ("BGC thread %d idle (%d heaps) (gc%Id)", heap_number, n_heaps, VolatileLoadWithoutBarrier (&settings.gc_index)));
+ bgc_idle_thread_event.Wait(INFINITE, FALSE);
+ dprintf (9999, ("BGC thread %d waking from idle (%d heaps) (gc%Id)", heap_number, n_heaps, VolatileLoadWithoutBarrier (&settings.gc_index)));
continue;
}
#endif //DYNAMIC_HEAP_COUNT
@@ -38968,7 +39300,7 @@ void gc_heap::bgc_thread_function()
dprintf (SPINLOCK_LOG, ("bgc Lgc"));
leave_spin_lock (&gc_lock);
#ifdef MULTIPLE_HEAPS
- dprintf(1, ("End of BGC - starting all BGC threads"));
+ dprintf(1, ("End of BGC"));
bgc_t_join.restart();
#endif //MULTIPLE_HEAPS
}
@@ -42845,6 +43177,9 @@ bool gc_heap::init_dynamic_data()
{
process_start_time = now;
smoothed_desired_total[0] = dynamic_data_of (0)->min_size * n_heaps;
+#ifdef DYNAMIC_HEAP_COUNT
+ last_suspended_end_time = now;
+#endif //DYNAMIC_HEAP_COUNT
#ifdef HEAP_BALANCE_INSTRUMENTATION
last_gc_end_time_us = now;
dprintf (HEAP_BALANCE_LOG, ("qpf=%zd, start: %zd(%d)", qpf, start_raw_ts, now));
@@ -47943,6 +48278,7 @@ HRESULT GCHeap::Initialize()
uint32_t nhp = 1;
uint32_t nhp_from_config = 0;
+ uint32_t max_nhp_from_config = (uint32_t)GCConfig::GetMaxHeapCount();
#ifndef MULTIPLE_HEAPS
GCConfig::SetServerGC(false);
@@ -48137,6 +48473,10 @@ HRESULT GCHeap::Initialize()
#ifdef MULTIPLE_HEAPS
assert (nhp <= g_num_processors);
+ if (max_nhp_from_config)
+ {
+ nhp = min (nhp, max_nhp_from_config);
+ }
gc_heap::n_max_heaps = nhp;
gc_heap::n_heaps = nhp;
hr = gc_heap::initialize_gc (seg_size, large_seg_size, pin_seg_size, nhp);
@@ -48287,9 +48627,32 @@ HRESULT GCHeap::Initialize()
{
// start with only 1 heap
gc_heap::smoothed_desired_total[0] /= gc_heap::n_heaps;
- gc_heap::g_heaps[0]->change_heap_count (1);
+ int initial_n_heaps = 1;
+ dprintf (9999, ("gc_heap::n_heaps is %d, initial %d", gc_heap::n_heaps, initial_n_heaps));
+
+ {
+ if (!gc_heap::prepare_to_change_heap_count (initial_n_heaps))
+ {
+ // we don't have sufficient resources.
+ return E_FAIL;
+ }
+
+ gc_heap::dynamic_heap_count_data.new_n_heaps = initial_n_heaps;
+ gc_heap::dynamic_heap_count_data.idle_thread_count = 0;
+ gc_heap::dynamic_heap_count_data.init_only_p = true;
+
+ int max_threads_to_wake = max (gc_heap::n_heaps, initial_n_heaps);
+ gc_t_join.update_n_threads (max_threads_to_wake);
+ gc_heap::gc_start_event.Set ();
+ }
+
+ gc_heap::g_heaps[0]->change_heap_count (initial_n_heaps);
+ gc_heap::gc_start_event.Reset ();
+
+ // This needs to be different from our initial heap count so we can make sure we wait for
+ // the idle threads correctly in gc_thread_function.
+ gc_heap::dynamic_heap_count_data.last_n_heaps = 0;
}
- gc_heap::dynamic_heap_count_data.new_n_heaps = gc_heap::n_heaps;
#endif //DYNAMIC_HEAP_COUNT
GCScan::GcRuntimeStructuresValid (TRUE);
@@ -49861,10 +50224,16 @@ void gc_heap::do_post_gc()
}
#endif //BGC_SERVO_TUNING
+#ifdef BACKGROUND_GC
+ const char* str_gc_type = (settings.concurrent ? "BGC" : (gc_heap::background_running_p () ? "FGC" : "NGC"));
+#else
+ const char* str_gc_type = "NGC";
+#endif //BACKGROUND_GC
+
dprintf (1, (ThreadStressLog::gcDetailedEndMsg(),
- VolatileLoad(&settings.gc_index),
- dd_collection_count(hp->dynamic_data_of(0)),
- (size_t)(GetHighPrecisionTimeStamp() / 1000),
+ VolatileLoad (&settings.gc_index),
+ dd_collection_count (hp->dynamic_data_of (0)),
+ (size_t)(GetHighPrecisionTimeStamp () / 1000),
settings.condemned_generation,
(settings.concurrent ? "BGC" : (gc_heap::background_running_p() ? "FGC" : "NGC")),
(settings.compaction ? "C" : "S"),
diff --git a/src/coreclr/gc/gcconfig.h b/src/coreclr/gc/gcconfig.h
index 72786778d5a978..aeded6bc97f17f 100644
--- a/src/coreclr/gc/gcconfig.h
+++ b/src/coreclr/gc/gcconfig.h
@@ -83,6 +83,7 @@ class GCConfigStringHolder
INT_CONFIG (BGCSpinCount, "BGCSpinCount", NULL, 140, "Specifies the bgc spin count") \
INT_CONFIG (BGCSpin, "BGCSpin", NULL, 2, "Specifies the bgc spin time") \
INT_CONFIG (HeapCount, "GCHeapCount", "System.GC.HeapCount", 0, "Specifies the number of server GC heaps") \
+ INT_CONFIG (MaxHeapCount, "GCMaxHeapCount", "System.GC.MaxHeapCount", 0, "Specifies the max number of server GC heaps to adjust to") \
INT_CONFIG (Gen0Size, "GCgen0size", NULL, 0, "Specifies the smallest gen0 budget") \
INT_CONFIG (SegmentSize, "GCSegmentSize", NULL, 0, "Specifies the managed heap segment size") \
INT_CONFIG (LatencyMode, "GCLatencyMode", NULL, -1, "Specifies the GC latency mode - batch, interactive or low latency (note that the same " \
diff --git a/src/coreclr/gc/gcee.cpp b/src/coreclr/gc/gcee.cpp
index 6dbbfd64a7a514..32738da9b603ab 100644
--- a/src/coreclr/gc/gcee.cpp
+++ b/src/coreclr/gc/gcee.cpp
@@ -510,9 +510,12 @@ bool GCHeap::IsInFrozenSegment(Object *object)
void GCHeap::UpdateFrozenSegment(segment_handle seg, uint8_t* allocated, uint8_t* committed)
{
#ifdef FEATURE_BASICFREEZE
- heap_segment* heap_seg = reinterpret_cast(seg);
- heap_segment_committed(heap_seg) = committed;
- heap_segment_allocated(heap_seg) = allocated;
+#ifdef MULTIPLE_HEAPS
+ gc_heap* heap = gc_heap::g_heaps[0];
+#else
+ gc_heap* heap = pGenGCHeap;
+#endif //MULTIPLE_HEAPS
+ heap->update_ro_segment (reinterpret_cast(seg), allocated, committed);
#endif // FEATURE_BASICFREEZE
}
diff --git a/src/coreclr/gc/gcpriv.h b/src/coreclr/gc/gcpriv.h
index da0085ce19610d..cce6c5ee28adf0 100644
--- a/src/coreclr/gc/gcpriv.h
+++ b/src/coreclr/gc/gcpriv.h
@@ -402,8 +402,6 @@ struct GCDebugSpinLock {
#if defined(DYNAMIC_HEAP_COUNT)
// time in microseconds we wait for the more space lock
uint64_t msl_wait_time;
- // number of times we wait for the more space lock
- uint64_t msl_wait_count;
#endif //DYNAMIC_HEAP_COUNT
GCDebugSpinLock()
@@ -415,7 +413,7 @@ struct GCDebugSpinLock {
, num_switch_thread(0), num_wait_longer(0), num_switch_thread_w(0), num_disable_preemptive_w(0)
#endif
#if defined(DYNAMIC_HEAP_COUNT)
- , msl_wait_time(0), msl_wait_count(0)
+ , msl_wait_time(0)
#endif //DYNAMIC_HEAP_COUNT
{
}
@@ -1148,15 +1146,12 @@ class dynamic_data
//
// The following 3 fields are updated at the beginning of each GC, if that GC condemns this generation.
//
- // The number of GC that condemned this generation. The only difference between this
- // and collection_count is just that collection_count is maintained for all physical generations
- // (currently there are 5) whereas this is only updated for logical generations (there are 3).
- size_t gc_clock;
- uint64_t time_clock; //time when this gc started
+ size_t gc_clock; // the gc index
+ uint64_t time_clock; // time when this gc started
uint64_t previous_time_clock; // time when previous gc started
// Updated at the end of a GC, if that GC condemns this generation.
- size_t gc_elapsed_time; // Time it took for the gc to complete
+ size_t gc_elapsed_time; // time it took for the gc to complete
//
// The following fields (and fields in sdata) are initialized during GC init time and do not change.
@@ -1495,6 +1490,8 @@ class mark_queue_t
void verify_empty();
};
+float median_of_3 (float a, float b, float c);
+
//class definition of the internal class
class gc_heap
{
@@ -2380,6 +2377,7 @@ class gc_heap
#ifdef FEATURE_BASICFREEZE
PER_HEAP_METHOD BOOL insert_ro_segment (heap_segment* seg);
PER_HEAP_METHOD void remove_ro_segment (heap_segment* seg);
+ PER_HEAP_METHOD void update_ro_segment (heap_segment* seg, uint8_t* allocated, uint8_t* committed);
#endif //FEATURE_BASICFREEZE
PER_HEAP_METHOD BOOL set_ro_segment_in_range (heap_segment* seg);
#ifndef USE_REGIONS
@@ -2421,6 +2419,7 @@ class gc_heap
#ifndef USE_REGIONS
PER_HEAP_METHOD void rearrange_heap_segments(BOOL compacting);
#endif //!USE_REGIONS
+ PER_HEAP_METHOD void delay_free_segments();
PER_HEAP_ISOLATED_METHOD void distribute_free_regions();
#ifdef BACKGROUND_GC
PER_HEAP_ISOLATED_METHOD void reset_write_watch_for_gc_heap(void* base_address, size_t region_size);
@@ -2596,11 +2595,17 @@ class gc_heap
// re-initialize a heap in preparation to putting it back into service
PER_HEAP_METHOD void recommission_heap();
+ PER_HEAP_ISOLATED_METHOD size_t get_num_completed_gcs();
+
+ PER_HEAP_ISOLATED_METHOD int calculate_new_heap_count();
+
// check if we should change the heap count
PER_HEAP_METHOD void check_heap_count();
- PER_HEAP_METHOD bool prepare_to_change_heap_count (int new_n_heaps);
+ PER_HEAP_ISOLATED_METHOD bool prepare_to_change_heap_count (int new_n_heaps);
PER_HEAP_METHOD bool change_heap_count (int new_n_heaps);
+
+ PER_HEAP_ISOLATED_METHOD size_t get_msl_wait_time();
#endif //DYNAMIC_HEAP_COUNT
#endif //USE_REGIONS
@@ -3777,6 +3782,13 @@ class gc_heap
PER_HEAP_FIELD_MAINTAINED mark* loh_pinned_queue;
#endif //FEATURE_LOH_COMPACTION
+#ifdef DYNAMIC_HEAP_COUNT
+ PER_HEAP_FIELD_MAINTAINED GCEvent gc_idle_thread_event;
+#ifdef BACKGROUND_GC
+ PER_HEAP_FIELD_MAINTAINED GCEvent bgc_idle_thread_event;
+#endif //BACKGROUND_GC
+#endif //DYNAMIC_HEAP_COUNT
+
/******************************************/
// PER_HEAP_FIELD_MAINTAINED_ALLOC fields //
/******************************************/
@@ -4083,7 +4095,6 @@ class gc_heap
// These 2 fields' values do not change but are set/unset per GC
PER_HEAP_ISOLATED_FIELD_SINGLE_GC GCEvent gc_start_event;
PER_HEAP_ISOLATED_FIELD_SINGLE_GC GCEvent ee_suspend_event;
- PER_HEAP_ISOLATED_FIELD_SINGLE_GC GCEvent gc_idle_thread_event;
// Also updated on the heap#0 GC thread because that's where we are actually doing the decommit.
PER_HEAP_ISOLATED_FIELD_SINGLE_GC BOOL gradual_decommit_in_progress_p;
@@ -4162,6 +4173,10 @@ class gc_heap
PER_HEAP_ISOLATED_FIELD_SINGLE_GC uint8_t* gc_high; // high end of the highest region being condemned
#endif //USE_REGIONS
+#ifdef STRESS_DYNAMIC_HEAP_COUNT
+ PER_HEAP_ISOLATED_FIELD_SINGLE_GC int heaps_in_this_gc;
+#endif //STRESS_DYNAMIC_HEAP_COUNT
+
/**************************************************/
// PER_HEAP_ISOLATED_FIELD_SINGLE_GC_ALLOC fields //
/**************************************************/
@@ -4260,37 +4275,65 @@ class gc_heap
#endif //USE_REGIONS
#ifdef DYNAMIC_HEAP_COUNT
+ // Sample collection -
+ //
+ // For every GC, we collect the msl wait time + GC pause duration info and use both to calculate the
+ // throughput cost percentage. We will also be using the wait time and the GC pause duration separately
+ // for other purposes in the future.
+ //
+ // For all gen2 GCs we also keep a separate array currently just for the GC cost. This serves as a backstop
+ // to smooth out the situation when we rarely pick the gen2 GCs in the first array.
struct dynamic_heap_count_data_t
{
static const int sample_size = 3;
struct sample
{
- uint64_t elapsed_between_gcs; // time between gcs in microseconds
- uint64_t gc_elapsed_time; // time the gc took
- uint64_t soh_msl_wait_time; // time the allocator spent waiting for the soh msl lock
- uint64_t uoh_msl_wait_time; // time the allocator spent waiting for the uoh msl lock
- size_t allocating_thread_count;// number of allocating threads
- size_t heap_size;
+ uint64_t elapsed_between_gcs; // time between gcs in microseconds (this should really be between_pauses)
+ uint64_t gc_pause_time; // pause time for this GC
+ uint64_t msl_wait_time;
};
- unsigned sample_index;
+ uint32_t sample_index;
sample samples[sample_size];
+ size_t prev_num_completed_gcs;
+
+ uint32_t gen2_sample_index;
+ // This is (gc_elapsed_time / time inbetween this and the last gen2 GC)
+ float gen2_gc_percents[sample_size];
- float median_percent_overhead; // estimated overhead of allocator + gc
- float smoothed_median_percent_overhead; // exponentially smoothed version
- float percent_heap_space_cost_per_heap; // percent space cost of adding a heap
- float overhead_reduction_per_step_up; // percentage effect on overhead of increasing heap count
- float overhead_increase_per_step_down; // percentage effect on overhead of decreasing heap count
- float space_cost_increase_per_step_up; // percentage effect on space of increasing heap count
- float space_cost_decrease_per_step_down;// percentage effect on space of decreasing heap count
+ float median_throughput_cost_percent; // estimated overhead of allocator + gc
+ float smoothed_median_throughput_cost_percent; // exponentially smoothed version
+ float percent_heap_space_cost_per_heap; // percent space cost of adding a heap
+ float tcp_reduction_per_step_up; // throughput cost percent effect of increasing heap count
+ float tcp_increase_per_step_down; // throughput cost percent effect of decreasing heap count
+ float scp_increase_per_step_up; // space cost percent effect of increasing heap count
+ float scp_decrease_per_step_down; // space cost percent effect of decreasing heap count
int new_n_heaps;
+ // the heap count we changed from
+ int last_n_heaps;
+ // don't start a GC till we see (n_max_heaps - new_n_heaps) number of threads idling
+ VOLATILE(int32_t) idle_thread_count;
+ bool init_only_p;
+
+ bool should_change_heap_count;
+ int heap_count_to_change_to;
+ int heap_count_change_count;
#ifdef STRESS_DYNAMIC_HEAP_COUNT
int lowest_heap_with_msl_uoh;
#endif //STRESS_DYNAMIC_HEAP_COUNT
+
+ float get_median_gen2_gc_percent()
+ {
+ return median_of_3 (gen2_gc_percents[0], gen2_gc_percents[1], gen2_gc_percents[2]);
+ }
};
PER_HEAP_ISOLATED_FIELD_MAINTAINED dynamic_heap_count_data_t dynamic_heap_count_data;
+ PER_HEAP_ISOLATED_FIELD_MAINTAINED uint64_t last_suspended_end_time;
+ // If the last full GC is blocking, this is that GC's index; for BGC, this is the settings.gc_index
+ // when the BGC ended.
+ PER_HEAP_ISOLATED_FIELD_MAINTAINED size_t gc_index_full_gc_end;
#endif //DYNAMIC_HEAP_COUNT
/****************************************************/
@@ -4866,7 +4909,6 @@ uint64_t& dd_previous_time_clock (dynamic_data* inst)
return inst->previous_time_clock;
}
-
inline
size_t& dd_gc_clock_interval (dynamic_data* inst)
{
diff --git a/src/coreclr/ilasm/assem.cpp b/src/coreclr/ilasm/assem.cpp
index dd2c91ac093acb..2bd90fadb8f916 100644
--- a/src/coreclr/ilasm/assem.cpp
+++ b/src/coreclr/ilasm/assem.cpp
@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)
char* Assembler::ReflectionNotation(mdToken tk)
{
+ // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
+ // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
+ // length is in bytes.
char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
+ const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
+ const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
*sz=0;
switch(TypeFromToken(tk))
{
@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
if(pClass)
{
- strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
+ strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
pc = sz;
while((pc = strchr(pc,NESTING_SEP)) != NULL)
{
@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
{
ULONG N;
mdToken tkResScope;
- if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
+ if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
{
- WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
+ int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
if(TypeFromToken(tkResScope)==mdtAssemblyRef)
{
AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
if(pAsmRef)
{
- pc = &sz[strlen(sz)];
- pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
+ // We assume below that if sprintf_s fails due to buffer overrun,
+ // execution fails fast and sprintf_s doesn't return.
+ int sprintf_ret;
+ const size_t szLen = strlen(sz);
+ pc = &sz[szLen];
+ size_t szRemainingSizeBytes = szSizeBytes - szLen;
+
+ sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
- ULONG L=0;
- if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
+ pc += sprintf_ret;
+ szRemainingSizeBytes -= (size_t)sprintf_ret;
+
+ unsigned L=0;
+ if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
+ {
+ // L is in bytes and doesn't include the terminating null.
+ if (L > (cchUniBuf - 1) * sizeof(WCHAR))
+ {
+ report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
+ *sz=0;
+ break;
+ }
+ else if (szRemainingSizeBytes == 0)
+ {
+ report->error("TypeRef too long.\n");
+ *sz=0;
+ break;
+ }
+
+ if (szRemainingSizeBytes > 0)
+ {
+ memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
+ wzUniBuf[L>>1] = 0;
+ ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
+ if (ret <= 0)
+ {
+ report->error("Locale too long.\n");
+ *sz=0;
+ break;
+ }
+ else
+ {
+ pc += ret;
+ szRemainingSizeBytes -= (size_t)ret;
+ }
+ }
+ }
+ else
{
- memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
- wzUniBuf[L>>1] = 0;
- WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
+ sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
+ pc += sprintf_ret;
+ szRemainingSizeBytes -= (size_t)sprintf_ret;
}
- else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
- pc = &sz[strlen(sz)];
- if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
+ if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
{
- pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
+ sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
+ pc += sprintf_ret;
+ szRemainingSizeBytes -= (size_t)sprintf_ret;
+
BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
- for(N=0; N> 1),"%2.2x",*pb);
+ for(unsigned i=0; im_pLinearScan->dumpLsraStatsSummary(jitstdout);
+ compiler->m_pLinearScan->dumpLsraStatsSummary(jitstdout());
}
#endif // TRACK_LSRA_STATS
@@ -2104,7 +2104,7 @@ void CodeGen::genEmitUnwindDebugGCandEH()
genCreateAndStoreGCInfo(codeSize, prologSize, epilogSize DEBUGARG(codePtr));
#ifdef DEBUG
- FILE* dmpf = jitstdout;
+ FILE* dmpf = jitstdout();
compiler->opts.dmpHex = false;
if (!strcmp(compiler->info.compMethodName, "= 0.5)
{
- fprintf(fout, " GT_%-17s %7u (%4.1lf%%) %3u bytes each\n", GenTree::OpName(oper.Oper), count,
- percentage, size);
+ jitprintf(" GT_%-17s %7u (%4.1lf%%) %3u bytes each\n", GenTree::OpName(oper.Oper), count,
+ percentage, size);
remainingCount -= count;
}
else
@@ -1484,14 +1482,14 @@ void Compiler::compShutdown()
if (remainingCount > 0)
{
- fprintf(fout, " All other GT_xxx ... %7u (%4.1lf%%) ... %4.1lf%% small + %4.1lf%% large\n",
- remainingCount, 100.0 * remainingCount / totalCount, 100.0 * remainingCountSmall / totalCount,
- 100.0 * remainingCountLarge / totalCount);
+ jitprintf(" All other GT_xxx ... %7u (%4.1lf%%) ... %4.1lf%% small + %4.1lf%% large\n", remainingCount,
+ 100.0 * remainingCount / totalCount, 100.0 * remainingCountSmall / totalCount,
+ 100.0 * remainingCountLarge / totalCount);
}
- fprintf(fout, " -----------------------------------------------------\n");
- fprintf(fout, " Total ....... %11u --ALL-- ... %4.1lf%% small + %4.1lf%% large\n", totalCount,
- 100.0 * countSmall / totalCount, 100.0 * countLarge / totalCount);
- fprintf(fout, "\n");
+ jitprintf(" -----------------------------------------------------\n");
+ jitprintf(" Total ....... %11u --ALL-- ... %4.1lf%% small + %4.1lf%% large\n", totalCount,
+ 100.0 * countSmall / totalCount, 100.0 * countLarge / totalCount);
+ jitprintf("\n");
}
#endif // COUNT_AST_OPERS
@@ -1500,49 +1498,49 @@ void Compiler::compShutdown()
if (grossVMsize && grossNCsize)
{
- fprintf(fout, "\n");
- fprintf(fout, "--------------------------------------\n");
- fprintf(fout, "Function and GC info size stats\n");
- fprintf(fout, "--------------------------------------\n");
+ jitprintf("\n");
+ jitprintf("--------------------------------------\n");
+ jitprintf("Function and GC info size stats\n");
+ jitprintf("--------------------------------------\n");
- fprintf(fout, "[%7u VM, %8u %6s %4u%%] %s\n", grossVMsize, grossNCsize, Target::g_tgtCPUName,
- 100 * grossNCsize / grossVMsize, "Total (excluding GC info)");
+ jitprintf("[%7u VM, %8u %6s %4u%%] %s\n", grossVMsize, grossNCsize, Target::g_tgtCPUName,
+ 100 * grossNCsize / grossVMsize, "Total (excluding GC info)");
- fprintf(fout, "[%7u VM, %8u %6s %4u%%] %s\n", grossVMsize, totalNCsize, Target::g_tgtCPUName,
- 100 * totalNCsize / grossVMsize, "Total (including GC info)");
+ jitprintf("[%7u VM, %8u %6s %4u%%] %s\n", grossVMsize, totalNCsize, Target::g_tgtCPUName,
+ 100 * totalNCsize / grossVMsize, "Total (including GC info)");
if (gcHeaderISize || gcHeaderNSize)
{
- fprintf(fout, "\n");
+ jitprintf("\n");
- fprintf(fout, "GC tables : [%7uI,%7uN] %7u byt (%u%% of IL, %u%% of %s).\n",
- gcHeaderISize + gcPtrMapISize, gcHeaderNSize + gcPtrMapNSize, totalNCsize - grossNCsize,
- 100 * (totalNCsize - grossNCsize) / grossVMsize, 100 * (totalNCsize - grossNCsize) / grossNCsize,
- Target::g_tgtCPUName);
+ jitprintf("GC tables : [%7uI,%7uN] %7u byt (%u%% of IL, %u%% of %s).\n", gcHeaderISize + gcPtrMapISize,
+ gcHeaderNSize + gcPtrMapNSize, totalNCsize - grossNCsize,
+ 100 * (totalNCsize - grossNCsize) / grossVMsize, 100 * (totalNCsize - grossNCsize) / grossNCsize,
+ Target::g_tgtCPUName);
- fprintf(fout, "GC headers : [%7uI,%7uN] %7u byt, [%4.1fI,%4.1fN] %4.1f byt/meth\n", gcHeaderISize,
- gcHeaderNSize, gcHeaderISize + gcHeaderNSize, (float)gcHeaderISize / (genMethodICnt + 0.001),
- (float)gcHeaderNSize / (genMethodNCnt + 0.001),
- (float)(gcHeaderISize + gcHeaderNSize) / genMethodCnt);
+ jitprintf("GC headers : [%7uI,%7uN] %7u byt, [%4.1fI,%4.1fN] %4.1f byt/meth\n", gcHeaderISize,
+ gcHeaderNSize, gcHeaderISize + gcHeaderNSize, (float)gcHeaderISize / (genMethodICnt + 0.001),
+ (float)gcHeaderNSize / (genMethodNCnt + 0.001),
+ (float)(gcHeaderISize + gcHeaderNSize) / genMethodCnt);
- fprintf(fout, "GC ptr maps : [%7uI,%7uN] %7u byt, [%4.1fI,%4.1fN] %4.1f byt/meth\n", gcPtrMapISize,
- gcPtrMapNSize, gcPtrMapISize + gcPtrMapNSize, (float)gcPtrMapISize / (genMethodICnt + 0.001),
- (float)gcPtrMapNSize / (genMethodNCnt + 0.001),
- (float)(gcPtrMapISize + gcPtrMapNSize) / genMethodCnt);
+ jitprintf("GC ptr maps : [%7uI,%7uN] %7u byt, [%4.1fI,%4.1fN] %4.1f byt/meth\n", gcPtrMapISize,
+ gcPtrMapNSize, gcPtrMapISize + gcPtrMapNSize, (float)gcPtrMapISize / (genMethodICnt + 0.001),
+ (float)gcPtrMapNSize / (genMethodNCnt + 0.001),
+ (float)(gcPtrMapISize + gcPtrMapNSize) / genMethodCnt);
}
else
{
- fprintf(fout, "\n");
+ jitprintf("\n");
- fprintf(fout, "GC tables take up %u bytes (%u%% of instr, %u%% of %6s code).\n",
- totalNCsize - grossNCsize, 100 * (totalNCsize - grossNCsize) / grossVMsize,
- 100 * (totalNCsize - grossNCsize) / grossNCsize, Target::g_tgtCPUName);
+ jitprintf("GC tables take up %u bytes (%u%% of instr, %u%% of %6s code).\n", totalNCsize - grossNCsize,
+ 100 * (totalNCsize - grossNCsize) / grossVMsize, 100 * (totalNCsize - grossNCsize) / grossNCsize,
+ Target::g_tgtCPUName);
}
#ifdef DEBUG
#if DOUBLE_ALIGN
- fprintf(fout, "%u out of %u methods generated with double-aligned stack\n",
- Compiler::s_lvaDoubleAlignedProcsCount, genMethodCnt);
+ jitprintf("%u out of %u methods generated with double-aligned stack\n", Compiler::s_lvaDoubleAlignedProcsCount,
+ genMethodCnt);
#endif
#endif
}
@@ -1550,110 +1548,110 @@ void Compiler::compShutdown()
#endif // DISPLAY_SIZES
#if CALL_ARG_STATS
- compDispCallArgStats(fout);
+ compDispCallArgStats(jitstdout());
#endif
#if COUNT_BASIC_BLOCKS
- fprintf(fout, "--------------------------------------------------\n");
- fprintf(fout, "Basic block count frequency table:\n");
- fprintf(fout, "--------------------------------------------------\n");
- bbCntTable.dump(fout);
- fprintf(fout, "--------------------------------------------------\n");
-
- fprintf(fout, "\n");
-
- fprintf(fout, "--------------------------------------------------\n");
- fprintf(fout, "IL method size frequency table for methods with a single basic block:\n");
- fprintf(fout, "--------------------------------------------------\n");
- bbOneBBSizeTable.dump(fout);
- fprintf(fout, "--------------------------------------------------\n");
-
- fprintf(fout, "--------------------------------------------------\n");
- fprintf(fout, "fgComputeDoms `while (change)` iterations:\n");
- fprintf(fout, "--------------------------------------------------\n");
- domsChangedIterationTable.dump(fout);
- fprintf(fout, "--------------------------------------------------\n");
-
- fprintf(fout, "--------------------------------------------------\n");
- fprintf(fout, "fgComputeReachabilitySets `while (change)` iterations:\n");
- fprintf(fout, "--------------------------------------------------\n");
- computeReachabilitySetsIterationTable.dump(fout);
- fprintf(fout, "--------------------------------------------------\n");
-
- fprintf(fout, "--------------------------------------------------\n");
- fprintf(fout, "fgComputeReachability `while (change)` iterations:\n");
- fprintf(fout, "--------------------------------------------------\n");
- computeReachabilityIterationTable.dump(fout);
- fprintf(fout, "--------------------------------------------------\n");
+ jitprintf("--------------------------------------------------\n");
+ jitprintf("Basic block count frequency table:\n");
+ jitprintf("--------------------------------------------------\n");
+ bbCntTable.dump(jitstdout());
+ jitprintf("--------------------------------------------------\n");
+
+ jitprintf("\n");
+
+ jitprintf("--------------------------------------------------\n");
+ jitprintf("IL method size frequency table for methods with a single basic block:\n");
+ jitprintf("--------------------------------------------------\n");
+ bbOneBBSizeTable.dump(jitstdout());
+ jitprintf("--------------------------------------------------\n");
+
+ jitprintf("--------------------------------------------------\n");
+ jitprintf("fgComputeDoms `while (change)` iterations:\n");
+ jitprintf("--------------------------------------------------\n");
+ domsChangedIterationTable.dump(jitstdout());
+ jitprintf("--------------------------------------------------\n");
+
+ jitprintf("--------------------------------------------------\n");
+ jitprintf("fgComputeReachabilitySets `while (change)` iterations:\n");
+ jitprintf("--------------------------------------------------\n");
+ computeReachabilitySetsIterationTable.dump(jitstdout());
+ jitprintf("--------------------------------------------------\n");
+
+ jitprintf("--------------------------------------------------\n");
+ jitprintf("fgComputeReachability `while (change)` iterations:\n");
+ jitprintf("--------------------------------------------------\n");
+ computeReachabilityIterationTable.dump(jitstdout());
+ jitprintf("--------------------------------------------------\n");
#endif // COUNT_BASIC_BLOCKS
#if COUNT_LOOPS
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "Loop stats\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "Total number of methods with loops is %5u\n", totalLoopMethods);
- fprintf(fout, "Total number of loops is %5u\n", totalLoopCount);
- fprintf(fout, "Maximum number of loops per method is %5u\n", maxLoopsPerMethod);
- fprintf(fout, "# of methods overflowing nat loop table is %5u\n", totalLoopOverflows);
- fprintf(fout, "Total number of 'unnatural' loops is %5u\n", totalUnnatLoopCount);
- fprintf(fout, "# of methods overflowing unnat loop limit is %5u\n", totalUnnatLoopOverflows);
- fprintf(fout, "Total number of loops with an iterator is %5u\n", iterLoopCount);
- fprintf(fout, "Total number of loops with a constant iterator is %5u\n", constIterLoopCount);
-
- fprintf(fout, "--------------------------------------------------\n");
- fprintf(fout, "Loop count frequency table:\n");
- fprintf(fout, "--------------------------------------------------\n");
- loopCountTable.dump(fout);
- fprintf(fout, "--------------------------------------------------\n");
- fprintf(fout, "Loop exit count frequency table:\n");
- fprintf(fout, "--------------------------------------------------\n");
- loopExitCountTable.dump(fout);
- fprintf(fout, "--------------------------------------------------\n");
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("Loop stats\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("Total number of methods with loops is %5u\n", totalLoopMethods);
+ jitprintf("Total number of loops is %5u\n", totalLoopCount);
+ jitprintf("Maximum number of loops per method is %5u\n", maxLoopsPerMethod);
+ jitprintf("# of methods overflowing nat loop table is %5u\n", totalLoopOverflows);
+ jitprintf("Total number of 'unnatural' loops is %5u\n", totalUnnatLoopCount);
+ jitprintf("# of methods overflowing unnat loop limit is %5u\n", totalUnnatLoopOverflows);
+ jitprintf("Total number of loops with an iterator is %5u\n", iterLoopCount);
+ jitprintf("Total number of loops with a constant iterator is %5u\n", constIterLoopCount);
+
+ jitprintf("--------------------------------------------------\n");
+ jitprintf("Loop count frequency table:\n");
+ jitprintf("--------------------------------------------------\n");
+ loopCountTable.dump(jitstdout());
+ jitprintf("--------------------------------------------------\n");
+ jitprintf("Loop exit count frequency table:\n");
+ jitprintf("--------------------------------------------------\n");
+ loopExitCountTable.dump(jitstdout());
+ jitprintf("--------------------------------------------------\n");
#endif // COUNT_LOOPS
#if MEASURE_NODE_SIZE
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "GenTree node allocation stats\n");
- fprintf(fout, "---------------------------------------------------\n");
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("GenTree node allocation stats\n");
+ jitprintf("---------------------------------------------------\n");
- fprintf(fout, "Allocated %6I64u tree nodes (%7I64u bytes total, avg %4I64u bytes per method)\n",
- genNodeSizeStats.genTreeNodeCnt, genNodeSizeStats.genTreeNodeSize,
- genNodeSizeStats.genTreeNodeSize / genMethodCnt);
+ jitprintf("Allocated %6I64u tree nodes (%7I64u bytes total, avg %4I64u bytes per method)\n",
+ genNodeSizeStats.genTreeNodeCnt, genNodeSizeStats.genTreeNodeSize,
+ genNodeSizeStats.genTreeNodeSize / genMethodCnt);
- fprintf(fout, "Allocated %7I64u bytes of unused tree node space (%3.2f%%)\n",
- genNodeSizeStats.genTreeNodeSize - genNodeSizeStats.genTreeNodeActualSize,
- (float)(100 * (genNodeSizeStats.genTreeNodeSize - genNodeSizeStats.genTreeNodeActualSize)) /
- genNodeSizeStats.genTreeNodeSize);
+ jitprintf("Allocated %7I64u bytes of unused tree node space (%3.2f%%)\n",
+ genNodeSizeStats.genTreeNodeSize - genNodeSizeStats.genTreeNodeActualSize,
+ (float)(100 * (genNodeSizeStats.genTreeNodeSize - genNodeSizeStats.genTreeNodeActualSize)) /
+ genNodeSizeStats.genTreeNodeSize);
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "Distribution of per-method GenTree node counts:\n");
- genTreeNcntHist.dump(fout);
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("Distribution of per-method GenTree node counts:\n");
+ genTreeNcntHist.dump(jitstdout());
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "Distribution of per-method GenTree node allocations (in bytes):\n");
- genTreeNsizHist.dump(fout);
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("Distribution of per-method GenTree node allocations (in bytes):\n");
+ genTreeNsizHist.dump(jitstdout());
#endif // MEASURE_NODE_SIZE
#if MEASURE_BLOCK_SIZE
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "BasicBlock and FlowEdge/BasicBlockList allocation stats\n");
- fprintf(fout, "---------------------------------------------------\n");
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("BasicBlock and FlowEdge/BasicBlockList allocation stats\n");
+ jitprintf("---------------------------------------------------\n");
- fprintf(fout, "Allocated %6u basic blocks (%7u bytes total, avg %4u bytes per method)\n", BasicBlock::s_Count,
- BasicBlock::s_Size, BasicBlock::s_Size / genMethodCnt);
- fprintf(fout, "Allocated %6u flow nodes (%7u bytes total, avg %4u bytes per method)\n", genFlowNodeCnt,
- genFlowNodeSize, genFlowNodeSize / genMethodCnt);
+ jitprintf("Allocated %6u basic blocks (%7u bytes total, avg %4u bytes per method)\n", BasicBlock::s_Count,
+ BasicBlock::s_Size, BasicBlock::s_Size / genMethodCnt);
+ jitprintf("Allocated %6u flow nodes (%7u bytes total, avg %4u bytes per method)\n", genFlowNodeCnt, genFlowNodeSize,
+ genFlowNodeSize / genMethodCnt);
#endif // MEASURE_BLOCK_SIZE
@@ -1661,21 +1659,21 @@ void Compiler::compShutdown()
if (s_dspMemStats)
{
- fprintf(fout, "\nAll allocations:\n");
- ArenaAllocator::dumpAggregateMemStats(jitstdout);
+ jitprintf("\nAll allocations:\n");
+ ArenaAllocator::dumpAggregateMemStats(jitstdout());
- fprintf(fout, "\nLargest method:\n");
- ArenaAllocator::dumpMaxMemStats(jitstdout);
+ jitprintf("\nLargest method:\n");
+ ArenaAllocator::dumpMaxMemStats(jitstdout());
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "Distribution of total memory allocated per method (in KB):\n");
- memAllocHist.dump(fout);
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("Distribution of total memory allocated per method (in KB):\n");
+ memAllocHist.dump(jitstdout());
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "Distribution of total memory used per method (in KB):\n");
- memUsedHist.dump(fout);
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("Distribution of total memory used per method (in KB):\n");
+ memUsedHist.dump(jitstdout());
}
#endif // MEASURE_MEM_ALLOC
@@ -1685,29 +1683,29 @@ void Compiler::compShutdown()
if (JitConfig.DisplayLoopHoistStats() != 0)
#endif // DEBUG
{
- PrintAggregateLoopHoistStats(jitstdout);
+ PrintAggregateLoopHoistStats(jitstdout());
}
#endif // LOOP_HOIST_STATS
#if TRACK_ENREG_STATS
if (JitConfig.JitEnregStats() != 0)
{
- s_enregisterStats.Dump(fout);
+ s_enregisterStats.Dump(jitstdout());
}
#endif // TRACK_ENREG_STATS
#if MEASURE_PTRTAB_SIZE
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "GC pointer table stats\n");
- fprintf(fout, "---------------------------------------------------\n");
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("GC pointer table stats\n");
+ jitprintf("---------------------------------------------------\n");
- fprintf(fout, "Reg pointer descriptor size (internal): %8u (avg %4u per method)\n", GCInfo::s_gcRegPtrDscSize,
- GCInfo::s_gcRegPtrDscSize / genMethodCnt);
+ jitprintf("Reg pointer descriptor size (internal): %8u (avg %4u per method)\n", GCInfo::s_gcRegPtrDscSize,
+ GCInfo::s_gcRegPtrDscSize / genMethodCnt);
- fprintf(fout, "Total pointer table size: %8u (avg %4u per method)\n", GCInfo::s_gcTotalPtrTabSize,
- GCInfo::s_gcTotalPtrTabSize / genMethodCnt);
+ jitprintf("Total pointer table size: %8u (avg %4u per method)\n", GCInfo::s_gcTotalPtrTabSize,
+ GCInfo::s_gcTotalPtrTabSize / genMethodCnt);
#endif // MEASURE_PTRTAB_SIZE
@@ -1715,37 +1713,37 @@ void Compiler::compShutdown()
if (genMethodCnt != 0)
{
- fprintf(fout, "\n");
- fprintf(fout, "A total of %6u methods compiled", genMethodCnt);
+ jitprintf("\n");
+ jitprintf("A total of %6u methods compiled", genMethodCnt);
#if DISPLAY_SIZES
if (genMethodICnt || genMethodNCnt)
{
- fprintf(fout, " (%u interruptible, %u non-interruptible)", genMethodICnt, genMethodNCnt);
+ jitprintf(" (%u interruptible, %u non-interruptible)", genMethodICnt, genMethodNCnt);
}
#endif // DISPLAY_SIZES
- fprintf(fout, ".\n");
+ jitprintf(".\n");
}
#endif // MEASURE_NODE_SIZE || MEASURE_BLOCK_SIZE || MEASURE_PTRTAB_SIZE || DISPLAY_SIZES
#if EMITTER_STATS
- emitterStats(fout);
+ emitterStats(jitstdout());
#endif
#if MEASURE_FATAL
- fprintf(fout, "\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, "Fatal errors stats\n");
- fprintf(fout, "---------------------------------------------------\n");
- fprintf(fout, " badCode: %u\n", fatal_badCode);
- fprintf(fout, " noWay: %u\n", fatal_noWay);
- fprintf(fout, " implLimitation: %u\n", fatal_implLimitation);
- fprintf(fout, " NOMEM: %u\n", fatal_NOMEM);
- fprintf(fout, " noWayAssertBody: %u\n", fatal_noWayAssertBody);
+ jitprintf("\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf("Fatal errors stats\n");
+ jitprintf("---------------------------------------------------\n");
+ jitprintf(" badCode: %u\n", fatal_badCode);
+ jitprintf(" noWay: %u\n", fatal_noWay);
+ jitprintf(" implLimitation: %u\n", fatal_implLimitation);
+ jitprintf(" NOMEM: %u\n", fatal_NOMEM);
+ jitprintf(" noWayAssertBody: %u\n", fatal_noWayAssertBody);
#ifdef DEBUG
- fprintf(fout, " noWayAssertBodyArgs: %u\n", fatal_noWayAssertBodyArgs);
+ jitprintf(" noWayAssertBodyArgs: %u\n", fatal_noWayAssertBodyArgs);
#endif // DEBUG
- fprintf(fout, " NYI: %u\n", fatal_NYI);
+ jitprintf(" NYI: %u\n", fatal_NYI);
#endif // MEASURE_FATAL
}
@@ -1754,14 +1752,14 @@ void Compiler::compShutdown()
*/
/* static */
-void Compiler::compDisplayStaticSizes(FILE* fout)
+void Compiler::compDisplayStaticSizes()
{
#if MEASURE_NODE_SIZE
- GenTree::DumpNodeSizes(fout);
+ GenTree::DumpNodeSizes();
#endif
#if EMITTER_STATS
- emitterStaticStats(fout);
+ emitterStaticStats();
#endif
}
@@ -5177,7 +5175,7 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl
#if TRACK_LSRA_STATS
if (JitConfig.DisplayLsraStats() == 2)
{
- m_pLinearScan->dumpLsraStatsCsv(jitstdout);
+ m_pLinearScan->dumpLsraStatsCsv(jitstdout());
}
#endif // TRACK_LSRA_STATS
@@ -5282,6 +5280,13 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
weight_t minBlockSoFar = BB_MAX_WEIGHT;
BasicBlock* bbHavingAlign = nullptr;
BasicBlock::loopNumber currentAlignedLoopNum = BasicBlock::NOT_IN_LOOP;
+ bool visitedLoopNum[BasicBlock::MAX_LOOP_NUM];
+ memset(visitedLoopNum, false, sizeof(visitedLoopNum));
+
+#ifdef DEBUG
+ unsigned visitedBlockForLoopNum[BasicBlock::MAX_LOOP_NUM];
+ memset(visitedBlockForLoopNum, 0, sizeof(visitedBlockForLoopNum));
+#endif
if ((fgFirstBB != nullptr) && fgFirstBB->isLoopAlign())
{
@@ -5304,7 +5309,7 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
}
}
- // If there is a unconditional jump (which is not part of callf/always pair)
+ // If there is an unconditional jump (which is not part of callf/always pair)
if (opts.compJitHideAlignBehindJmp && (block->bbJumpKind == BBJ_ALWAYS) && !block->isBBCallAlwaysPairTail())
{
// Track the lower weight blocks
@@ -5358,12 +5363,19 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
madeChanges = true;
unmarkedLoopAlign = true;
}
- else if ((block->bbNatLoopNum != BasicBlock::NOT_IN_LOOP) && (block->bbNatLoopNum == loopTop->bbNatLoopNum))
+ else if ((loopTop->bbNatLoopNum != BasicBlock::NOT_IN_LOOP) && visitedLoopNum[loopTop->bbNatLoopNum])
{
+#ifdef DEBUG
+ char buffer[100];
+ sprintf_s(buffer, 100, "loop block " FMT_BB " appears before top of loop",
+ visitedBlockForLoopNum[loopTop->bbNatLoopNum]);
+#endif
+
// In some odd cases we may see blocks within the loop before we see the
// top block of the loop. Just bail on aligning such loops.
//
- loopTop->unmarkLoopAlign(this DEBUG_ARG("loop block appears before top of loop"));
+
+ loopTop->unmarkLoopAlign(this DEBUG_ARG(buffer));
madeChanges = true;
unmarkedLoopAlign = true;
}
@@ -5398,6 +5410,20 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
break;
}
}
+
+ if (block->bbNatLoopNum != BasicBlock::NOT_IN_LOOP)
+ {
+#ifdef DEBUG
+ if (!visitedLoopNum[block->bbNatLoopNum])
+ {
+ // Record the first block for which bbNatLoopNum was seen for
+ // debugging purpose.
+ visitedBlockForLoopNum[block->bbNatLoopNum] = block->bbNum;
+ }
+#endif
+ // If this block is part of loop, mark the loopNum as visited.
+ visitedLoopNum[block->bbNatLoopNum] = true;
+ }
}
assert(loopsToProcess == 0);
@@ -5879,7 +5905,7 @@ int Compiler::compCompile(CORINFO_MODULE_HANDLE classPtr,
}
#endif // FUNC_INFO_LOGGING
- // if (s_compMethodsCount==0) setvbuf(jitstdout, NULL, _IONBF, 0);
+ // if (s_compMethodsCount==0) setvbuf(jitstdout(), NULL, _IONBF, 0);
if (compIsForInlining())
{
@@ -6363,7 +6389,7 @@ void Compiler::compCompileFinish()
if (s_dspMemStats || verbose)
{
printf("\nAllocations for %s (MethodHash=%08x)\n", info.compFullName, info.compMethodHash());
- compArenaAllocator->dumpMemStats(jitstdout);
+ compArenaAllocator->dumpMemStats(jitstdout());
}
#endif // DEBUG
#endif // MEASURE_MEM_ALLOC
diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
index 645e54258a637a..8339d6d274f4f5 100644
--- a/src/coreclr/jit/compiler.h
+++ b/src/coreclr/jit/compiler.h
@@ -10345,7 +10345,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
InlineInfo* inlineInfo);
void compDone();
- static void compDisplayStaticSizes(FILE* fout);
+ static void compDisplayStaticSizes();
//------------ Some utility functions --------------
diff --git a/src/coreclr/jit/disasm.cpp b/src/coreclr/jit/disasm.cpp
index e1926a3f640b7b..fd5c98eb068810 100644
--- a/src/coreclr/jit/disasm.cpp
+++ b/src/coreclr/jit/disasm.cpp
@@ -1478,12 +1478,12 @@ void DisAssembler::disAsmCode(BYTE* hotCodePtr, size_t hotCodeSize, BYTE* coldCo
}
#else // !DEBUG
// NOTE: non-DEBUG builds always use jitstdout currently!
- disAsmFile = jitstdout;
+ disAsmFile = jitstdout();
#endif // !DEBUG
if (disAsmFile == nullptr)
{
- disAsmFile = jitstdout;
+ disAsmFile = jitstdout();
}
// As this writes to a common file, this is not reentrant.
@@ -1519,7 +1519,7 @@ void DisAssembler::disAsmCode(BYTE* hotCodePtr, size_t hotCodeSize, BYTE* coldCo
DisasmBuffer(disAsmFile, /* printIt */ true);
fprintf(disAsmFile, "\n");
- if (disAsmFile != jitstdout)
+ if (disAsmFile != jitstdout())
{
fclose(disAsmFile);
}
diff --git a/src/coreclr/jit/ee_il_dll.cpp b/src/coreclr/jit/ee_il_dll.cpp
index bcf7c7be401c21..57c52855ea8393 100644
--- a/src/coreclr/jit/ee_il_dll.cpp
+++ b/src/coreclr/jit/ee_il_dll.cpp
@@ -31,8 +31,6 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
/*****************************************************************************/
-FILE* jitstdout = nullptr;
-
ICorJitHost* g_jitHost = nullptr;
bool g_jitInitialized = false;
@@ -72,15 +70,28 @@ extern "C" DLLEXPORT void jitStartup(ICorJitHost* jitHost)
assert(!JitConfig.isInitialized());
JitConfig.initialize(jitHost);
+#ifdef FEATURE_TRACELOGGING
+ JitTelemetry::NotifyDllProcessAttach();
+#endif
+ Compiler::compStartup();
+
+ g_jitInitialized = true;
+}
+
+static FILE* volatile s_jitstdout;
+
+static FILE* jitstdoutInit()
+{
const WCHAR* jitStdOutFile = JitConfig.JitStdOutFile();
+ FILE* file = nullptr;
if (jitStdOutFile != nullptr)
{
- jitstdout = _wfopen(jitStdOutFile, W("a"));
- assert(jitstdout != nullptr);
+ file = _wfopen(jitStdOutFile, W("a"));
+ assert(file != nullptr);
}
#if !defined(HOST_UNIX)
- if (jitstdout == nullptr)
+ if (file == nullptr)
{
int stdoutFd = _fileno(procstdout());
// Check fileno error output(s) -1 may overlap with errno result
@@ -89,46 +100,61 @@ extern "C" DLLEXPORT void jitStartup(ICorJitHost* jitHost)
// or bogus and avoid making further calls.
if ((stdoutFd != -1) && (stdoutFd != -2) && (errno != EINVAL))
{
- int jitstdoutFd = _dup(_fileno(procstdout()));
+ int jitstdoutFd = _dup(stdoutFd);
// Check the error status returned by dup.
if (jitstdoutFd != -1)
{
_setmode(jitstdoutFd, _O_TEXT);
- jitstdout = _fdopen(jitstdoutFd, "w");
- assert(jitstdout != nullptr);
+ file = _fdopen(jitstdoutFd, "w");
+ assert(file != nullptr);
// Prevent the FILE* from buffering its output in order to avoid calls to
// `fflush()` throughout the code.
- setvbuf(jitstdout, nullptr, _IONBF, 0);
+ setvbuf(file, nullptr, _IONBF, 0);
}
}
}
#endif // !HOST_UNIX
- // If jitstdout is still null, fallback to whatever procstdout() was
- // initially set to.
- if (jitstdout == nullptr)
+ if (file == nullptr)
{
- jitstdout = procstdout();
+ file = procstdout();
}
-#ifdef FEATURE_TRACELOGGING
- JitTelemetry::NotifyDllProcessAttach();
-#endif
- Compiler::compStartup();
+ FILE* observed = InterlockedCompareExchangeT(&s_jitstdout, file, nullptr);
- g_jitInitialized = true;
+ if (observed != nullptr)
+ {
+ if (file != procstdout())
+ {
+ fclose(file);
+ }
+
+ return observed;
+ }
+
+ return file;
}
-#ifndef DEBUG
+FILE* jitstdout()
+{
+ FILE* file = s_jitstdout;
+ if (file != nullptr)
+ {
+ return file;
+ }
+
+ return jitstdoutInit();
+}
+
+// Like printf/logf, but only outputs to jitstdout -- skips call back into EE.
void jitprintf(const char* fmt, ...)
{
va_list vl;
va_start(vl, fmt);
- vfprintf(jitstdout, fmt, vl);
+ vfprintf(jitstdout(), fmt, vl);
va_end(vl);
}
-#endif
void jitShutdown(bool processIsTerminating)
{
@@ -139,14 +165,15 @@ void jitShutdown(bool processIsTerminating)
Compiler::compShutdown();
- if (jitstdout != procstdout())
+ FILE* file = s_jitstdout;
+ if ((file != nullptr) && (file != procstdout()))
{
// When the process is terminating, the fclose call is unnecessary and is also prone to
// crashing since the UCRT itself often frees the backing memory earlier on in the
// termination sequence.
if (!processIsTerminating)
{
- fclose(jitstdout);
+ fclose(file);
}
}
diff --git a/src/coreclr/jit/emit.cpp b/src/coreclr/jit/emit.cpp
index c85724f9240b98..8a671b7a757b88 100644
--- a/src/coreclr/jit/emit.cpp
+++ b/src/coreclr/jit/emit.cpp
@@ -215,7 +215,7 @@ unsigned emitter::emitInt32CnsCnt;
unsigned emitter::emitNegCnsCnt;
unsigned emitter::emitPow2CnsCnt;
-void emitterStaticStats(FILE* fout)
+void emitterStaticStats()
{
// The IG buffer size depends on whether we are storing a debug info pointer or not. For our purposes
// here, do not include that.
@@ -227,6 +227,8 @@ void emitterStaticStats(FILE* fout)
insGroup* igDummy = nullptr;
+ FILE* fout = jitstdout();
+
fprintf(fout, "\n");
fprintf(fout, "insGroup:\n");
fprintf(fout, "Offset / size of igNext = %3zu / %2zu\n", offsetof(insGroup, igNext),
diff --git a/src/coreclr/jit/emitarm.cpp b/src/coreclr/jit/emitarm.cpp
index a0dc786782b0bc..784f797bc5efed 100644
--- a/src/coreclr/jit/emitarm.cpp
+++ b/src/coreclr/jit/emitarm.cpp
@@ -4850,6 +4850,7 @@ void emitter::emitIns_Call(EmitCallType callType,
dispIns(id);
appendToCurIG(id);
+ emitLastMemBarrier = nullptr; // Cannot optimize away future memory barriers
}
/*****************************************************************************
diff --git a/src/coreclr/jit/emitarm64.cpp b/src/coreclr/jit/emitarm64.cpp
index b4e81322e2a696..ef1220e325e47c 100644
--- a/src/coreclr/jit/emitarm64.cpp
+++ b/src/coreclr/jit/emitarm64.cpp
@@ -8886,6 +8886,7 @@ void emitter::emitIns_Call(EmitCallType callType,
dispIns(id);
appendToCurIG(id);
+ emitLastMemBarrier = nullptr; // Cannot optimize away future memory barriers
}
/*****************************************************************************
@@ -16615,6 +16616,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
emitAttr prevSize = emitLastIns->idOpSize();
ssize_t prevImm = emitGetInsSC(emitLastIns);
+ // If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
+ // therefore we cannot proceed.
+ // TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
+ // They should never be scaled(encoded) until its about to be written to the buffer.
+ if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
+ {
+ return eRO_none;
+ }
+
// Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
// For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
diff --git a/src/coreclr/jit/emitxarch.cpp b/src/coreclr/jit/emitxarch.cpp
index 980d40a47ac318..1c48d1c52f0bb2 100644
--- a/src/coreclr/jit/emitxarch.cpp
+++ b/src/coreclr/jit/emitxarch.cpp
@@ -5485,6 +5485,13 @@ void emitter::emitInsRMW(instruction ins, emitAttr attr, GenTreeStoreInd* storeI
{
assert(!src->isContained()); // there must be one non-contained src
+ if (addr->isContained() && addr->OperIs(GT_LCL_ADDR))
+ {
+ GenTreeLclVarCommon* lclVar = addr->AsLclVarCommon();
+ emitIns_S_R(ins, attr, src->GetRegNum(), lclVar->GetLclNum(), lclVar->GetLclOffs());
+ return;
+ }
+
// ind, reg
id = emitNewInstrAmd(attr, offset);
emitHandleMemOp(storeInd, id, emitInsModeFormat(ins, IF_ARD_RRD), ins);
diff --git a/src/coreclr/jit/error.cpp b/src/coreclr/jit/error.cpp
index 01e6f734b89f89..06635f5d582a1d 100644
--- a/src/coreclr/jit/error.cpp
+++ b/src/coreclr/jit/error.cpp
@@ -387,7 +387,7 @@ int logf(const char* fmt, ...)
{
// if the EE refuses to log it, we try to send it to stdout
va_start(args, fmt);
- written = vflogf(jitstdout, fmt, args);
+ written = vflogf(jitstdout(), fmt, args);
va_end(args);
}
#if 0 // Enable this only when you need it
@@ -448,7 +448,7 @@ void gcDump_logf(const char* fmt, ...)
{
// if the EE refuses to log it, we try to send it to stdout
va_start(args, fmt);
- vflogf(jitstdout, fmt, args);
+ vflogf(jitstdout(), fmt, args);
va_end(args);
}
#if 0 // Enable this only when you need it
diff --git a/src/coreclr/jit/fgdiagnostic.cpp b/src/coreclr/jit/fgdiagnostic.cpp
index e79bdb0e46368a..6dbc5e9a654845 100644
--- a/src/coreclr/jit/fgdiagnostic.cpp
+++ b/src/coreclr/jit/fgdiagnostic.cpp
@@ -674,7 +674,7 @@ FILE* Compiler::fgOpenFlowGraphFile(bool* wbDontClose, Phases phase, PhasePositi
}
else if (strcmp(filename, "stdout") == 0)
{
- fgxFile = jitstdout;
+ fgxFile = jitstdout();
*wbDontClose = true;
}
else if (strcmp(filename, "stderr") == 0)
diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
index d02ce4714d8a2e..d6d524f375ea73 100644
--- a/src/coreclr/jit/gentree.cpp
+++ b/src/coreclr/jit/gentree.cpp
@@ -481,10 +481,12 @@ void GenTree::ReportOperBashing(FILE* f)
#if MEASURE_NODE_SIZE
-void GenTree::DumpNodeSizes(FILE* fp)
+void GenTree::DumpNodeSizes()
{
// Dump the sizes of the various GenTree flavors
+ FILE* fp = jitstdout();
+
fprintf(fp, "Small tree node size = %zu bytes\n", TREE_NODE_SZ_SMALL);
fprintf(fp, "Large tree node size = %zu bytes\n", TREE_NODE_SZ_LARGE);
fprintf(fp, "\n");
@@ -19637,8 +19639,8 @@ GenTree* Compiler::gtNewSimdBinOpNode(
}
else
{
- assert(op2->TypeIs(type, simdBaseType, genActualType(simdBaseType)) ||
- (op2->TypeIs(TYP_SIMD12) && type == TYP_SIMD16));
+ assert((genActualType(op2) == genActualType(type)) || (genActualType(op2) == genActualType(simdBaseType)) ||
+ (op2->TypeIs(TYP_SIMD12) && (type == TYP_SIMD16)));
}
NamedIntrinsic intrinsic = NI_Illegal;
diff --git a/src/coreclr/jit/gentree.h b/src/coreclr/jit/gentree.h
index 27688c3d41790d..109da6a15c30d8 100644
--- a/src/coreclr/jit/gentree.h
+++ b/src/coreclr/jit/gentree.h
@@ -2311,7 +2311,7 @@ struct GenTree
void SetIndirExceptionFlags(Compiler* comp);
#if MEASURE_NODE_SIZE
- static void DumpNodeSizes(FILE* fp);
+ static void DumpNodeSizes();
#endif
#ifdef DEBUG
diff --git a/src/coreclr/jit/host.h b/src/coreclr/jit/host.h
index c99a0601e499b0..0ccefae924e637 100644
--- a/src/coreclr/jit/host.h
+++ b/src/coreclr/jit/host.h
@@ -3,6 +3,8 @@
/*****************************************************************************/
+void jitprintf(const char* fmt, ...);
+
#ifdef DEBUG
#undef printf
@@ -44,7 +46,6 @@ extern "C" void ANALYZER_NORETURN __cdecl assertAbort(const char* why, const cha
// Re-define printf in Release to use jitstdout (can be overwritten with DOTNET_JitStdOutFile=file)
#undef printf
#define printf jitprintf
-void jitprintf(const char* fmt, ...);
#undef assert
#define assert(p) (void)0
@@ -55,7 +56,7 @@ void jitprintf(const char* fmt, ...);
#define _HOST_H_
/*****************************************************************************/
-extern FILE* jitstdout;
+FILE* jitstdout();
inline FILE* procstdout()
{
diff --git a/src/coreclr/jit/hwintrinsicxarch.cpp b/src/coreclr/jit/hwintrinsicxarch.cpp
index 488f65b5ac008d..065999982a87a9 100644
--- a/src/coreclr/jit/hwintrinsicxarch.cpp
+++ b/src/coreclr/jit/hwintrinsicxarch.cpp
@@ -3602,17 +3602,19 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
op2 = impSIMDPopStack();
op1 = impSIMDPopStack();
- if (unusedVal1)
+ // Consume operands we won't use, in case they have side effects.
+ //
+ if (unusedVal1 && !(*val1)->IsVectorZero())
{
impAppendTree(gtUnusedValNode(*val1), CHECK_SPILL_ALL, impCurStmtDI);
}
- if (unusedVal2)
+ if (unusedVal2 && !(*val2)->IsVectorZero())
{
impAppendTree(gtUnusedValNode(*val2), CHECK_SPILL_ALL, impCurStmtDI);
}
- if (unusedVal3)
+ if (unusedVal3 && !(*val3)->IsVectorZero())
{
impAppendTree(gtUnusedValNode(*val3), CHECK_SPILL_ALL, impCurStmtDI);
}
diff --git a/src/coreclr/jit/inline.cpp b/src/coreclr/jit/inline.cpp
index bae5755707594d..0ded3ef3482a70 100644
--- a/src/coreclr/jit/inline.cpp
+++ b/src/coreclr/jit/inline.cpp
@@ -480,7 +480,7 @@ void InlineContext::DumpData(unsigned indent)
{
const char* inlineReason = InlGetObservationString(m_Observation);
printf("%*s%u,\"%s\",\"%s\",", indent, "", GetOrdinal(), inlineReason, calleeName);
- m_Policy->DumpData(jitstdout);
+ m_Policy->DumpData(jitstdout());
printf("\n");
}
diff --git a/src/coreclr/jit/layout.cpp b/src/coreclr/jit/layout.cpp
index 113414ddfd7f7a..918fd4ab6521d4 100644
--- a/src/coreclr/jit/layout.cpp
+++ b/src/coreclr/jit/layout.cpp
@@ -421,6 +421,7 @@ void ClassLayout::InitializeGCPtrs(Compiler* compiler)
//
// Return value:
// true if at least one GC ByRef, false otherwise.
+//
bool ClassLayout::HasGCByRef() const
{
unsigned slots = GetSlotCount();
@@ -435,6 +436,39 @@ bool ClassLayout::HasGCByRef() const
return false;
}
+//------------------------------------------------------------------------
+// IntersectsGCPtr: check if the specified interval intersects with a GC
+// pointer.
+//
+// Parameters:
+// offset - The start offset of the interval
+// size - The size of the interval
+//
+// Return value:
+// True if it does.
+//
+bool ClassLayout::IntersectsGCPtr(unsigned offset, unsigned size) const
+{
+ if (!HasGCPtr())
+ {
+ return false;
+ }
+
+ unsigned startSlot = offset / TARGET_POINTER_SIZE;
+ unsigned endSlot = (offset + size - 1) / TARGET_POINTER_SIZE;
+ assert((startSlot < GetSlotCount()) && (endSlot < GetSlotCount()));
+
+ for (unsigned i = startSlot; i <= endSlot; i++)
+ {
+ if (IsGCPtr(i))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
//------------------------------------------------------------------------
// AreCompatible: check if 2 layouts are the same for copying.
//
diff --git a/src/coreclr/jit/layout.h b/src/coreclr/jit/layout.h
index 0e9d6ed65d03d3..59ecaa9405485d 100644
--- a/src/coreclr/jit/layout.h
+++ b/src/coreclr/jit/layout.h
@@ -216,6 +216,8 @@ class ClassLayout
}
}
+ bool IntersectsGCPtr(unsigned offset, unsigned size) const;
+
static bool AreCompatible(const ClassLayout* layout1, const ClassLayout* layout2);
private:
diff --git a/src/coreclr/jit/lower.cpp b/src/coreclr/jit/lower.cpp
index 81df694f05e1ff..2e454e64c14eb1 100644
--- a/src/coreclr/jit/lower.cpp
+++ b/src/coreclr/jit/lower.cpp
@@ -7484,6 +7484,28 @@ bool Lowering::CheckMultiRegLclVar(GenTreeLclVar* lclNode, int registerCount)
if (registerCount == varDsc->lvFieldCnt)
{
canEnregisterAsMultiReg = true;
+
+#ifdef FEATURE_SIMD
+ // TYP_SIMD12 breaks the above invariant that "we won't have
+ // matching reg and field counts"; for example, consider
+ //
+ // * STORE_LCL_VAR(CALL)
+ // * RETURN(LCL_VAR)
+ //
+ // These return in two GPR registers, while the fields of the
+ // local are stored in SIMD and GPR register, so registerCount
+ // == varDsc->lvFieldCnt == 2. But the backend cannot handle
+ // this.
+
+ for (int i = 0; i < varDsc->lvFieldCnt; i++)
+ {
+ if (comp->lvaGetDesc(varDsc->lvFieldLclStart + i)->TypeGet() == TYP_SIMD12)
+ {
+ canEnregisterAsMultiReg = false;
+ break;
+ }
+ }
+#endif
}
}
}
diff --git a/src/coreclr/jit/lowerarmarch.cpp b/src/coreclr/jit/lowerarmarch.cpp
index 86a5b2b1ab4cb4..2536d44aa00c56 100644
--- a/src/coreclr/jit/lowerarmarch.cpp
+++ b/src/coreclr/jit/lowerarmarch.cpp
@@ -1900,6 +1900,10 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(tmp2);
}
+ else
+ {
+ tmp2->SetUnusedValue();
+ }
BlockRange().Remove(node);
return tmp2->gtNext;
diff --git a/src/coreclr/jit/lowerxarch.cpp b/src/coreclr/jit/lowerxarch.cpp
index eba7bdb93e20fb..150ad04a55d99f 100644
--- a/src/coreclr/jit/lowerxarch.cpp
+++ b/src/coreclr/jit/lowerxarch.cpp
@@ -3754,17 +3754,14 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
// We want to optimize GetElement down to an Indir where possible as
// this unlocks additional containment opportunities for various nodes
- var_types newType;
- GenTree* newBase;
- GenTree* newIndex;
- uint32_t newScale;
- int32_t newOffset;
+ GenTree* newBase;
+ GenTree* newIndex;
+ uint32_t newScale;
+ int32_t newOffset;
GenTreeIndir* indir = op1->AsIndir();
GenTree* addr = indir->Addr();
- newType = simdBaseType;
-
if (addr->OperIsAddrMode())
{
// We have an existing addressing mode, so we want to try and
@@ -3860,7 +3857,8 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
new (comp, GT_LEA) GenTreeAddrMode(addr->TypeGet(), newBase, newIndex, newScale, newOffset);
BlockRange().InsertBefore(node, newAddr);
- GenTreeIndir* newIndir = comp->gtNewIndir(newType, newAddr, (indir->gtFlags & GTF_IND_FLAGS));
+ GenTreeIndir* newIndir =
+ comp->gtNewIndir(JITtype2varType(simdBaseJitType), newAddr, (indir->gtFlags & GTF_IND_FLAGS));
BlockRange().InsertBefore(node, newIndir);
LIR::Use use;
@@ -3868,6 +3866,10 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(newIndir);
}
+ else
+ {
+ newIndir->SetUnusedValue();
+ }
BlockRange().Remove(op1);
BlockRange().Remove(node);
@@ -3907,8 +3909,8 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
if (lclDsc->lvDoNotEnregister && (lclOffs <= 0xFFFF) && ((lclOffs + elemSize) <= lclDsc->lvExactSize()))
{
- GenTree* lclFld =
- comp->gtNewLclFldNode(lclVar->GetLclNum(), simdBaseType, static_cast(lclOffs));
+ GenTree* lclFld = comp->gtNewLclFldNode(lclVar->GetLclNum(), JITtype2varType(simdBaseJitType),
+ static_cast(lclOffs));
BlockRange().InsertBefore(node, lclFld);
LIR::Use use;
@@ -3916,6 +3918,10 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(lclFld);
}
+ else
+ {
+ lclFld->SetUnusedValue();
+ }
BlockRange().Remove(op1);
BlockRange().Remove(op2);
@@ -4158,6 +4164,11 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(cast);
}
+ else
+ {
+ node->ClearUnusedValue();
+ cast->SetUnusedValue();
+ }
next = LowerNode(cast);
}
@@ -4737,6 +4748,10 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(tmp1);
}
+ else
+ {
+ tmp1->SetUnusedValue();
+ }
BlockRange().Remove(node);
return LowerNode(tmp1);
@@ -5267,6 +5282,10 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(tmp1);
}
+ else
+ {
+ tmp1->SetUnusedValue();
+ }
BlockRange().Remove(node);
return tmp1->gtNext;
@@ -5306,7 +5325,8 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)
GenTreeIndir* indir = op1->AsIndir();
- GenTreeIndir* newIndir = comp->gtNewIndir(simdBaseType, indir->Addr(), (indir->gtFlags & GTF_IND_FLAGS));
+ GenTreeIndir* newIndir =
+ comp->gtNewIndir(JITtype2varType(simdBaseJitType), indir->Addr(), (indir->gtFlags & GTF_IND_FLAGS));
BlockRange().InsertBefore(node, newIndir);
LIR::Use use;
@@ -5314,6 +5334,10 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(newIndir);
}
+ else
+ {
+ newIndir->SetUnusedValue();
+ }
BlockRange().Remove(op1);
BlockRange().Remove(node);
@@ -5334,7 +5358,8 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)
if (lclDsc->lvDoNotEnregister && (lclOffs <= 0xFFFF) && ((lclOffs + elemSize) <= lclDsc->lvExactSize()))
{
- GenTree* lclFld = comp->gtNewLclFldNode(lclVar->GetLclNum(), simdBaseType, lclVar->GetLclOffs());
+ GenTree* lclFld =
+ comp->gtNewLclFldNode(lclVar->GetLclNum(), JITtype2varType(simdBaseJitType), lclVar->GetLclOffs());
BlockRange().InsertBefore(node, lclFld);
LIR::Use use;
@@ -5342,6 +5367,10 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(lclFld);
}
+ else
+ {
+ lclFld->SetUnusedValue();
+ }
BlockRange().Remove(op1);
BlockRange().Remove(node);
@@ -5426,6 +5455,11 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)
{
use.ReplaceWith(cast);
}
+ else
+ {
+ node->ClearUnusedValue();
+ cast->SetUnusedValue();
+ }
next = LowerNode(cast);
}
@@ -6470,7 +6504,7 @@ void Lowering::ContainCheckStoreIndir(GenTreeStoreInd* node)
case NI_AVX2_ConvertToUInt32:
{
// These intrinsics are "ins reg/mem, xmm"
- isContainable = varTypeIsIntegral(simdBaseType);
+ isContainable = varTypeIsIntegral(simdBaseType) && (genTypeSize(src) == genTypeSize(node));
break;
}
@@ -6534,7 +6568,8 @@ void Lowering::ContainCheckStoreIndir(GenTreeStoreInd* node)
size_t numArgs = hwintrinsic->GetOperandCount();
GenTree* lastOp = hwintrinsic->Op(numArgs);
- isContainable = HWIntrinsicInfo::isImmOp(intrinsicId, lastOp) && lastOp->IsCnsIntOrI();
+ isContainable = HWIntrinsicInfo::isImmOp(intrinsicId, lastOp) && lastOp->IsCnsIntOrI() &&
+ (genTypeSize(simdBaseType) == genTypeSize(node));
if (isContainable && (intrinsicId == NI_SSE2_Extract))
{
@@ -7922,6 +7957,9 @@ bool Lowering::IsContainableHWIntrinsicOp(GenTreeHWIntrinsic* parentNode, GenTre
// The memory form of this already takes a pointer and should be treated like a MemoryLoad
supportsGeneralLoads = !childNode->OperIsHWIntrinsic();
}
+
+ supportsGeneralLoads =
+ supportsGeneralLoads && (genTypeSize(childNode) >= genTypeSize(parentNode->GetSimdBaseType()));
break;
}
@@ -8101,7 +8139,16 @@ bool Lowering::IsContainableHWIntrinsicOp(GenTreeHWIntrinsic* parentNode, GenTre
case NI_Vector128_ToScalar:
case NI_Vector256_ToScalar:
case NI_Vector512_ToScalar:
+ case NI_SSE2_ConvertToInt32:
+ case NI_SSE2_ConvertToUInt32:
+ case NI_SSE2_X64_ConvertToInt64:
+ case NI_SSE2_X64_ConvertToUInt64:
+ case NI_SSE2_Extract:
+ case NI_SSE41_Extract:
+ case NI_SSE41_X64_Extract:
case NI_AVX_ExtractVector128:
+ case NI_AVX2_ConvertToInt32:
+ case NI_AVX2_ConvertToUInt32:
case NI_AVX2_ExtractVector128:
case NI_AVX512F_ExtractVector128:
case NI_AVX512F_ExtractVector256:
@@ -8144,15 +8191,24 @@ bool Lowering::IsContainableHWIntrinsicOp(GenTreeHWIntrinsic* parentNode, GenTre
return false;
}
+ case NI_Vector128_get_Zero:
+ case NI_Vector256_get_Zero:
+ {
+ // These are only containable as part of Sse41.Insert
+ return false;
+ }
+
case NI_SSE3_MoveAndDuplicate:
case NI_AVX2_BroadcastScalarToVector128:
case NI_AVX2_BroadcastScalarToVector256:
case NI_AVX512F_BroadcastScalarToVector512:
{
- var_types baseType = hwintrinsic->GetSimdBaseType();
- if (varTypeIsSmall(baseType))
+ var_types parentBaseType = parentNode->GetSimdBaseType();
+ var_types childBaseType = hwintrinsic->GetSimdBaseType();
+
+ if (varTypeIsSmall(parentBaseType) || (genTypeSize(parentBaseType) != genTypeSize(childBaseType)))
{
- // early return if the base type is not embedded broadcast compatible.
+ // early return if either base type is not embedded broadcast compatible.
return false;
}
@@ -8160,7 +8216,7 @@ bool Lowering::IsContainableHWIntrinsicOp(GenTreeHWIntrinsic* parentNode, GenTre
if (intrinsicId == NI_SSE3_MoveAndDuplicate)
{
// NI_SSE3_MoveAndDuplicate is for Vector128 only.
- assert(baseType == TYP_DOUBLE);
+ assert(childBaseType == TYP_DOUBLE);
}
if (comp->compOpportunisticallyDependsOn(InstructionSet_AVX512F_VL) &&
@@ -8193,6 +8249,15 @@ bool Lowering::IsContainableHWIntrinsicOp(GenTreeHWIntrinsic* parentNode, GenTre
case NI_AVX_BroadcastScalarToVector128:
case NI_AVX_BroadcastScalarToVector256:
{
+ var_types parentBaseType = parentNode->GetSimdBaseType();
+ var_types childBaseType = hwintrinsic->GetSimdBaseType();
+
+ if (varTypeIsSmall(parentBaseType) || (genTypeSize(parentBaseType) != genTypeSize(childBaseType)))
+ {
+ // early return if either base type is not embedded broadcast compatible.
+ return false;
+ }
+
return parentNode->OperIsEmbBroadcastCompatible();
}
@@ -8332,8 +8397,15 @@ void Lowering::TryFoldCnsVecForEmbeddedBroadcast(GenTreeHWIntrinsic* parentNode,
BlockRange().InsertBefore(broadcastNode, createScalar);
BlockRange().InsertBefore(createScalar, constScalar);
LIR::Use use;
- BlockRange().TryGetUse(childNode, &use);
- use.ReplaceWith(broadcastNode);
+ if (BlockRange().TryGetUse(childNode, &use))
+ {
+ use.ReplaceWith(broadcastNode);
+ }
+ else
+ {
+ broadcastNode->SetUnusedValue();
+ }
+
BlockRange().Remove(childNode);
LowerNode(createScalar);
LowerNode(broadcastNode);
diff --git a/src/coreclr/jit/lsra.cpp b/src/coreclr/jit/lsra.cpp
index 5c8fe4aae77889..0a33ba3faba9bd 100644
--- a/src/coreclr/jit/lsra.cpp
+++ b/src/coreclr/jit/lsra.cpp
@@ -1421,7 +1421,7 @@ PhaseStatus LinearScan::doLinearScan()
#endif
)
{
- dumpLsraStats(jitstdout);
+ dumpLsraStats(jitstdout());
}
#endif // TRACK_LSRA_STATS
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
index f29d6a57148136..3deada8eec085b 100644
--- a/src/coreclr/jit/morph.cpp
+++ b/src/coreclr/jit/morph.cpp
@@ -8919,6 +8919,14 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
break;
#endif
+ case GT_COMMA:
+ if (op2->OperIsStore() || (op2->OperGet() == GT_COMMA && op2->TypeGet() == TYP_VOID) || fgIsThrow(op2))
+ {
+ typ = tree->gtType = TYP_VOID;
+ }
+
+ break;
+
default:
break;
}
@@ -10770,6 +10778,12 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
break;
}
+ // Must be working with the same types of vectors.
+ if (hwop1->TypeGet() != node->TypeGet())
+ {
+ break;
+ }
+
if (toScalar != nullptr)
{
DEBUG_DESTROY_NODE(toScalar);
@@ -10793,8 +10807,6 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
}
#if defined(TARGET_XARCH)
- case NI_AVX512F_Add:
- case NI_AVX512BW_Add:
case NI_AVX512F_And:
case NI_AVX512DQ_And:
case NI_AVX512F_AndNot:
@@ -10836,13 +10848,6 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
switch (intrinsicId)
{
- case NI_AVX512F_Add:
- case NI_AVX512BW_Add:
- {
- maskIntrinsicId = NI_AVX512F_AddMask;
- break;
- }
-
case NI_AVX512F_And:
case NI_AVX512DQ_And:
{
diff --git a/src/coreclr/jit/optimizer.cpp b/src/coreclr/jit/optimizer.cpp
index 684f71b898f313..2ca5526476b82d 100644
--- a/src/coreclr/jit/optimizer.cpp
+++ b/src/coreclr/jit/optimizer.cpp
@@ -8875,9 +8875,15 @@ GenTree* Compiler::optRemoveRangeCheck(GenTreeBoundsChk* check, GenTree* comma,
}
#endif
- // Extract side effects
+ // TODO-Bug: We really should be extracting all side effects from the
+ // length and index here, but the length typically involves a GT_ARR_LENGTH
+ // that we would preserve. Usually, as part of proving that the range check
+ // passes, we have also proven that the ARR_LENGTH is non-faulting. We need
+ // a good way to communicate to this function that it is ok to ignore side
+ // effects of the ARR_LENGTH.
GenTree* sideEffList = nullptr;
- gtExtractSideEffList(check, &sideEffList, GTF_ASG);
+ gtExtractSideEffList(check->GetArrayLength(), &sideEffList, GTF_ASG);
+ gtExtractSideEffList(check->GetIndex(), &sideEffList);
if (sideEffList != nullptr)
{
@@ -9031,9 +9037,9 @@ void Compiler::optRemoveRedundantZeroInits()
CompAllocator allocator(getAllocator(CMK_ZeroInit));
LclVarRefCounts refCounts(allocator);
BitVecTraits bitVecTraits(lvaCount, this);
- BitVec zeroInitLocals = BitVecOps::MakeEmpty(&bitVecTraits);
- bool hasGCSafePoint = false;
- bool canThrow = false;
+ BitVec zeroInitLocals = BitVecOps::MakeEmpty(&bitVecTraits);
+ bool hasGCSafePoint = false;
+ bool hasImplicitControlFlow = false;
assert(fgNodeThreading == NodeThreading::AllTrees);
@@ -9044,6 +9050,8 @@ void Compiler::optRemoveRedundantZeroInits()
CompAllocator allocator(getAllocator(CMK_ZeroInit));
LclVarRefCounts defsInBlock(allocator);
bool removedTrackedDefs = false;
+ bool hasEHSuccs = block->HasPotentialEHSuccs(this);
+
for (Statement* stmt = block->FirstNonPhiDef(); stmt != nullptr;)
{
Statement* next = stmt->GetNextStmt();
@@ -9054,10 +9062,7 @@ void Compiler::optRemoveRedundantZeroInits()
hasGCSafePoint = true;
}
- if ((tree->gtFlags & GTF_EXCEPT) != 0)
- {
- canThrow = true;
- }
+ hasImplicitControlFlow |= hasEHSuccs && ((tree->gtFlags & GTF_EXCEPT) != 0);
switch (tree->gtOper)
{
@@ -9203,7 +9208,8 @@ void Compiler::optRemoveRedundantZeroInits()
}
}
- if (!removedExplicitZeroInit && isEntire && (!canThrow || !lclDsc->lvLiveInOutOfHndlr))
+ if (!removedExplicitZeroInit && isEntire &&
+ (!hasImplicitControlFlow || (lclDsc->lvTracked && !lclDsc->lvLiveInOutOfHndlr)))
{
// If compMethodRequiresPInvokeFrame() returns true, lower may later
// insert a call to CORINFO_HELP_INIT_PINVOKE_FRAME which is a gc-safe point.
diff --git a/src/coreclr/jit/promotion.cpp b/src/coreclr/jit/promotion.cpp
index e2c4e797a3c9d8..52163f4db0cceb 100644
--- a/src/coreclr/jit/promotion.cpp
+++ b/src/coreclr/jit/promotion.cpp
@@ -621,6 +621,38 @@ class LocalUses
bool EvaluateReplacement(
Compiler* comp, unsigned lclNum, const Access& access, unsigned inducedCount, weight_t inducedCountWtd)
{
+ // Verify that this replacement has proper GC ness compared to the
+ // layout. While reinterpreting GC fields to integers can be considered
+ // UB, there are scenarios where it can happen safely:
+ //
+ // * The user code could have guarded the access with a dynamic check
+ // that it doesn't contain a GC pointer, so that the access is actually
+ // in dead code. This happens e.g. in span functions in SPC.
+ //
+ // * For byrefs, reinterpreting as an integer could be ok in a
+ // restricted scope due to pinning.
+ //
+ // In theory we could allow these promotions in the restricted scope,
+ // but currently physical promotion works on a function-wide basis.
+
+ LclVarDsc* lcl = comp->lvaGetDesc(lclNum);
+ ClassLayout* layout = lcl->GetLayout();
+ if (layout->IntersectsGCPtr(access.Offset, genTypeSize(access.AccessType)))
+ {
+ if (((access.Offset % TARGET_POINTER_SIZE) != 0) ||
+ (layout->GetGCPtrType(access.Offset / TARGET_POINTER_SIZE) != access.AccessType))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ if (varTypeIsGC(access.AccessType))
+ {
+ return false;
+ }
+ }
+
unsigned countOverlappedCallArg = 0;
unsigned countOverlappedStoredFromCall = 0;
@@ -678,9 +710,8 @@ class LocalUses
// Now look at the overlapping struct uses that promotion will make more expensive.
- unsigned countReadBacks = 0;
- weight_t countReadBacksWtd = 0;
- LclVarDsc* lcl = comp->lvaGetDesc(lclNum);
+ unsigned countReadBacks = 0;
+ weight_t countReadBacksWtd = 0;
// For parameters or OSR locals we always need one read back.
if (lcl->lvIsParam || lcl->lvIsOSRLocal)
{
@@ -2309,8 +2340,36 @@ void ReplaceVisitor::ReadBackAfterCall(GenTreeCall* call, GenTree* user)
//
// If the remainder of the struct local is dying, then we expect that this
// entire struct local is now dying, since all field accesses are going to be
-// replaced with other locals. The exception is if there is a queued read
-// back for any of the fields.
+// replaced with other locals.
+//
+// There are two exceptions to the above:
+//
+// 1) If there is a queued readback for any of the fields, then there is
+// live state in the struct local, so it is not dying.
+//
+// 2) If there are further uses of the local in the same statement then we cannot
+// actually act on the last-use information we would provide here. That's because
+// uses of locals occur at the user and we do not model that here. In the real model
+// there are cases where we do not have any place to insert any IR between the two uses.
+// For example, consider:
+//
+// ▌ CALL void Program:Foo(Program+S,Program+S)
+// ├──▌ LCL_VAR struct V01 loc0
+// └──▌ LCL_VAR struct V01 loc0
+//
+// If V01 is promoted fully then both uses of V01 are last uses here; but
+// replacing the IR with
+//
+// ▌ CALL void Program:Foo(Program+S,Program+S)
+// ├──▌ LCL_VAR struct V01 loc0 (last use)
+// └──▌ COMMA struct
+// ├──▌ STORE_LCL_FLD int V01 loc0 [+0]
+// │ └──▌ LCL_VAR int V02 tmp0
+// └──▌ LCL_VAR struct V01 loc0 (last use)
+//
+// would be illegal since the created store overlaps with the first local,
+// and does not take into account that both uses occur simultaneously at
+// the position of the CALL node.
//
bool ReplaceVisitor::IsPromotedStructLocalDying(GenTreeLclVarCommon* lcl)
{
@@ -2331,6 +2390,15 @@ bool ReplaceVisitor::IsPromotedStructLocalDying(GenTreeLclVarCommon* lcl)
}
}
+ for (GenTree* cur = lcl->gtNext; cur != nullptr; cur = cur->gtNext)
+ {
+ assert(cur->OperIsAnyLocal());
+ if (cur->TypeIs(TYP_STRUCT) && (cur->AsLclVarCommon()->GetLclNum() == lcl->GetLclNum()))
+ {
+ return false;
+ }
+ }
+
return true;
}
@@ -2546,7 +2614,7 @@ void ReplaceVisitor::WriteBackBeforeCurrentStatement(unsigned lcl, unsigned offs
GenTree* readBack = Promotion::CreateWriteBack(m_compiler, lcl, rep);
Statement* stmt = m_compiler->fgNewStmtFromTree(readBack);
- JITDUMP("Writing back %s before " FMT_STMT "\n", rep.Description, stmt->GetID());
+ JITDUMP("Writing back %s before " FMT_STMT "\n", rep.Description, m_currentStmt->GetID());
DISPSTMT(stmt);
m_compiler->fgInsertStmtBefore(m_currentBlock, m_currentStmt, stmt);
ClearNeedsWriteBack(rep);
diff --git a/src/coreclr/jit/utils.cpp b/src/coreclr/jit/utils.cpp
index 3ec8e71c159e46..2e1c0a52a3d81b 100644
--- a/src/coreclr/jit/utils.cpp
+++ b/src/coreclr/jit/utils.cpp
@@ -2734,7 +2734,7 @@ float FloatingPointUtils::maximumNumber(float x, float y)
//
// It propagates NaN inputs back to the caller and
// otherwise returns the lesser of the inputs. It
-// treats +0 as lesser than -0 as per the specification.
+// treats +0 as greater than -0 as per the specification.
//
// Arguments:
// val1 - left operand
@@ -2763,7 +2763,7 @@ double FloatingPointUtils::minimum(double val1, double val2)
//
// It propagates NaN inputs back to the caller and
// otherwise returns the input with a lesser magnitude.
-// It treats +0 as lesser than -0 as per the specification.
+// It treats +0 as greater than -0 as per the specification.
//
// Arguments:
// x - left operand
@@ -2856,7 +2856,7 @@ double FloatingPointUtils::minimumNumber(double x, double y)
//
// It propagates NaN inputs back to the caller and
// otherwise returns the lesser of the inputs. It
-// treats +0 as lesser than -0 as per the specification.
+// treats +0 as greater than -0 as per the specification.
//
// Arguments:
// val1 - left operand
@@ -2885,7 +2885,7 @@ float FloatingPointUtils::minimum(float val1, float val2)
//
// It propagates NaN inputs back to the caller and
// otherwise returns the input with a lesser magnitude.
-// It treats +0 as lesser than -0 as per the specification.
+// It treats +0 as greater than -0 as per the specification.
//
// Arguments:
// x - left operand
diff --git a/src/coreclr/jit/valuenum.cpp b/src/coreclr/jit/valuenum.cpp
index 2ea2ee7845b8b2..2c638535d786e4 100644
--- a/src/coreclr/jit/valuenum.cpp
+++ b/src/coreclr/jit/valuenum.cpp
@@ -7891,7 +7891,7 @@ ValueNum ValueNumStore::EvalHWIntrinsicFunBinary(var_types type,
#endif
{
// Handle `x ^ x == 0`
- return arg0VN;
+ return VNZeroForType(type);
}
default:
diff --git a/src/coreclr/md/compiler/mdutil.cpp b/src/coreclr/md/compiler/mdutil.cpp
index 8fb1551ef7ceea..05b56a25875bb0 100644
--- a/src/coreclr/md/compiler/mdutil.cpp
+++ b/src/coreclr/md/compiler/mdutil.cpp
@@ -265,11 +265,7 @@ HRESULT LOADEDMODULES::FindCachedReadOnlyEntry(
{
// If the name matches...
LPCWSTR pszName = pRegMeta->GetNameOfDBFile();
- #ifdef FEATURE_CASE_SENSITIVE_FILESYSTEM
- if (u16_strcmp(szName, pszName) == 0)
- #else
if (SString::_wcsicmp(szName, pszName) == 0)
- #endif
{
ULONG cRefs;
@@ -299,11 +295,7 @@ HRESULT LOADEDMODULES::FindCachedReadOnlyEntry(
{
// If the name matches...
LPCWSTR pszName = pRegMeta->GetNameOfDBFile();
- #ifdef FEATURE_CASE_SENSITIVE_FILESYSTEM
- if (u16_strcmp(szName, pszName) == 0)
- #else
if (SString::_wcsicmp(szName, pszName) == 0)
- #endif
{
ULONG cRefs;
diff --git a/src/coreclr/nativeaot/Bootstrap/main.cpp b/src/coreclr/nativeaot/Bootstrap/main.cpp
index cc78cf8d6710a9..c2ff85b50e81fd 100644
--- a/src/coreclr/nativeaot/Bootstrap/main.cpp
+++ b/src/coreclr/nativeaot/Bootstrap/main.cpp
@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;
#endif // _MSC_VER
-extern "C" bool RhInitialize();
+extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());
extern "C" bool RhRegisterOSModule(void * pModule,
@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();
static int InitializeRuntime()
{
- if (!RhInitialize())
+ if (!RhInitialize(
+#ifdef NATIVEAOT_DLL
+ /* isDll */ true
+#else
+ /* isDll */ false
+#endif
+ ))
return -1;
void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
index 647aee4993d960..da6c90642f6f13 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
@@ -50,6 +50,7 @@
Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
+
@@ -94,7 +95,10 @@
+
+
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index 409fcb654e919d..1f5b2cd681095c 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -50,6 +50,8 @@ The .NET Foundation licenses this file to you under the MIT license.
libeventpipe-disabled
libeventpipe-enabled
+
+ true
@@ -121,7 +123,7 @@ The .NET Foundation licenses this file to you under the MIT license.
-
+
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index a4f34ef2225483..e9462399741c5e 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -263,7 +263,7 @@ The .NET Foundation licenses this file to you under the MIT license.
-
+
diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InternalCalls.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InternalCalls.cs
index 3c9d6c86ffc323..5c11243bbad99b 100644
--- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InternalCalls.cs
+++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InternalCalls.cs
@@ -62,12 +62,12 @@ internal static class InternalCalls
[RuntimeExport("RhCollect")]
internal static void RhCollect(int generation, InternalGCCollectionMode mode, bool lowMemoryP = false)
{
- RhpCollect(generation, mode, lowMemoryP);
+ RhpCollect(generation, mode, lowMemoryP ? Interop.BOOL.TRUE : Interop.BOOL.FALSE);
}
[DllImport(Redhawk.BaseName)]
[UnmanagedCallConv(CallConvs = new Type[] { typeof(CallConvCdecl) })]
- private static extern void RhpCollect(int generation, InternalGCCollectionMode mode, bool lowMemoryP);
+ private static extern void RhpCollect(int generation, InternalGCCollectionMode mode, Interop.BOOL lowMemoryP);
[RuntimeExport("RhGetGcTotalMemory")]
internal static long RhGetGcTotalMemory()
diff --git a/src/coreclr/nativeaot/Runtime/Full/CMakeLists.txt b/src/coreclr/nativeaot/Runtime/Full/CMakeLists.txt
index 3cbaa6e2f253a6..f3d48797c2184a 100644
--- a/src/coreclr/nativeaot/Runtime/Full/CMakeLists.txt
+++ b/src/coreclr/nativeaot/Runtime/Full/CMakeLists.txt
@@ -6,7 +6,7 @@ project(Runtime)
# Include auto-generated files on include path
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-if (CLR_CMAKE_TARGET_APPLE AND NOT CLR_CMAKE_TARGET_OSX)
+if (CLR_CMAKE_TARGET_APPLE)
list(APPEND RUNTIME_SOURCES_ARCH_ASM
${ARCH_SOURCES_DIR}/ThunkPoolThunks.${ASM_SUFFIX}
)
diff --git a/src/coreclr/nativeaot/Runtime/GCMemoryHelpers.cpp b/src/coreclr/nativeaot/Runtime/GCMemoryHelpers.cpp
index 27126acbdb839f..30f2c5c5fd3e9a 100644
--- a/src/coreclr/nativeaot/Runtime/GCMemoryHelpers.cpp
+++ b/src/coreclr/nativeaot/Runtime/GCMemoryHelpers.cpp
@@ -10,7 +10,6 @@
#include "PalRedhawkCommon.h"
#include "CommonMacros.inl"
-#include "GCMemoryHelpers.h"
#include "GCMemoryHelpers.inl"
// This function clears a piece of memory in a GC safe way.
@@ -31,11 +30,26 @@ COOP_PINVOKE_CDECL_HELPER(void *, RhpGcSafeZeroMemory, (void * mem, size_t size)
return mem;
}
+#if defined(TARGET_X86) || defined(TARGET_AMD64)
+ //
+ // Memory writes are already ordered
+ //
+ #define GCHeapMemoryBarrier()
+#else
+ #define GCHeapMemoryBarrier() MemoryBarrier()
+#endif
+
// Move memory, in a way that is compatible with a move onto the heap, but
// does not require the destination pointer to be on the heap.
COOP_PINVOKE_HELPER(void, RhBulkMoveWithWriteBarrier, (uint8_t* pDest, uint8_t* pSrc, size_t cbDest))
{
+ // It is possible that the bulk write is publishing object references accessible so far only
+ // by the current thread to shared memory.
+ // The memory model requires that writes performed by current thread are observable no later
+ // than the writes that will actually publish the references.
+ GCHeapMemoryBarrier();
+
if (pDest <= pSrc || pSrc + cbDest <= pDest)
InlineForwardGCSafeCopy(pDest, pSrc, cbDest);
else
@@ -43,8 +57,3 @@ COOP_PINVOKE_HELPER(void, RhBulkMoveWithWriteBarrier, (uint8_t* pDest, uint8_t*
InlinedBulkWriteBarrier(pDest, cbDest);
}
-
-void REDHAWK_CALLCONV RhpBulkWriteBarrier(void* pMemStart, uint32_t cbMemSize)
-{
- InlinedBulkWriteBarrier(pMemStart, cbMemSize);
-}
diff --git a/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp b/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp
index ec2fabcc540f1f..6df37cf23b9d36 100644
--- a/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp
+++ b/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp
@@ -35,7 +35,6 @@
#include "MethodTable.inl"
#include "CommonMacros.inl"
#include "volatile.h"
-#include "GCMemoryHelpers.h"
#include "GCMemoryHelpers.inl"
#include "yieldprocessornormalized.h"
#include "RhConfig.h"
diff --git a/src/coreclr/nativeaot/Runtime/arm64/AllocFast.S b/src/coreclr/nativeaot/Runtime/arm64/AllocFast.S
index 2bab323e65abca..79ffed2b05210d 100644
--- a/src/coreclr/nativeaot/Runtime/arm64/AllocFast.S
+++ b/src/coreclr/nativeaot/Runtime/arm64/AllocFast.S
@@ -46,7 +46,7 @@ OFFSETOF__Thread__m_alloc_context__alloc_limit = OFFSETOF__Thread__m_rgbAll
add x2, x2, x12
ldr x13, [x1, #OFFSETOF__Thread__m_alloc_context__alloc_limit]
cmp x2, x13
- bhi RhpNewFast_RarePath
+ bhi LOCAL_LABEL(RhpNewFast_RarePath)
// Update the alloc pointer to account for the allocation.
str x2, [x1, #OFFSETOF__Thread__m_alloc_context__alloc_ptr]
@@ -57,7 +57,7 @@ OFFSETOF__Thread__m_alloc_context__alloc_limit = OFFSETOF__Thread__m_rgbAll
mov x0, x12
ret
-RhpNewFast_RarePath:
+LOCAL_LABEL(RhpNewFast_RarePath):
mov x1, #0
b C_FUNC(RhpNewObject)
LEAF_END RhpNewFast, _TEXT
@@ -88,12 +88,12 @@ RhpNewFast_RarePath:
bl C_FUNC(RhpGcAlloc)
// Set the new objects MethodTable pointer on success.
- cbz x0, NewOutOfMemory
+ cbz x0, LOCAL_LABEL(NewOutOfMemory)
POP_COOP_PINVOKE_FRAME
EPILOG_RETURN
-NewOutOfMemory:
+LOCAL_LABEL(NewOutOfMemory):
// This is the OOM failure path. We are going to tail-call to a managed helper that will throw
// an out of memory exception that the caller of this allocator understands.
@@ -113,7 +113,7 @@ NewOutOfMemory:
movz x2, MAX_STRING_LENGTH & 0xFFFF
movk x2, MAX_STRING_LENGTH >> 16, lsl 16
cmp x1, x2
- bhi StringSizeOverflow
+ bhi LOCAL_LABEL(StringSizeOverflow)
// Compute overall allocation size (align(base size + (element size * elements), 8)).
mov w2, #STRING_COMPONENT_SIZE
@@ -139,7 +139,7 @@ NewOutOfMemory:
add x2, x2, x12
ldr x12, [x3, #OFFSETOF__Thread__m_alloc_context__alloc_limit]
cmp x2, x12
- bhi C_FUNC(RhpNewArrayRare)
+ bhi LOCAL_LABEL(RhNewString_Rare)
// Reload new object address into r12.
ldr x12, [x3, #OFFSETOF__Thread__m_alloc_context__alloc_ptr]
@@ -156,7 +156,7 @@ NewOutOfMemory:
ret
-StringSizeOverflow:
+LOCAL_LABEL(StringSizeOverflow):
// We get here if the length of the final string object can not be represented as an unsigned
// 32-bit value. We are going to tail-call to a managed helper that will throw
// an OOM exception that the caller of this allocator understands.
@@ -164,6 +164,9 @@ StringSizeOverflow:
// x0 holds MethodTable pointer already
mov x1, #1 // Indicate that we should throw OverflowException
b C_FUNC(RhExceptionHandling_FailedAllocation)
+
+LOCAL_LABEL(RhNewString_Rare):
+ b C_FUNC(RhpNewArrayRare)
LEAF_END RhNewString, _Text
// Allocate one dimensional, zero based array (SZARRAY).
@@ -177,7 +180,7 @@ StringSizeOverflow:
// case (32 dimensional MdArray) is less than 0xffff, and thus the product fits in 64 bits.
mov x2, #0x7FFFFFFF
cmp x1, x2
- bhi ArraySizeOverflow
+ bhi LOCAL_LABEL(ArraySizeOverflow)
ldrh w2, [x0, #OFFSETOF__MethodTable__m_usComponentSize]
umull x2, w1, w2
@@ -204,7 +207,7 @@ StringSizeOverflow:
add x2, x2, x12
ldr x12, [x3, #OFFSETOF__Thread__m_alloc_context__alloc_limit]
cmp x2, x12
- bhi C_FUNC(RhpNewArrayRare)
+ bhi LOCAL_LABEL(RhpNewArray_Rare)
// Reload new object address into x12.
ldr x12, [x3, #OFFSETOF__Thread__m_alloc_context__alloc_ptr]
@@ -221,7 +224,7 @@ StringSizeOverflow:
ret
-ArraySizeOverflow:
+LOCAL_LABEL(ArraySizeOverflow):
// We get here if the size of the final array object can not be represented as an unsigned
// 32-bit value. We are going to tail-call to a managed helper that will throw
// an overflow exception that the caller of this allocator understands.
@@ -229,6 +232,9 @@ ArraySizeOverflow:
// x0 holds MethodTable pointer already
mov x1, #1 // Indicate that we should throw OverflowException
b C_FUNC(RhExceptionHandling_FailedAllocation)
+
+LOCAL_LABEL(RhpNewArray_Rare):
+ b C_FUNC(RhpNewArrayRare)
LEAF_END RhpNewArray, _TEXT
// Allocate one dimensional, zero based array (SZARRAY) using the slow path that calls a runtime helper.
@@ -254,12 +260,12 @@ ArraySizeOverflow:
bl C_FUNC(RhpGcAlloc)
// Set the new objects MethodTable pointer and length on success.
- cbz x0, ArrayOutOfMemory
+ cbz x0, LOCAL_LABEL(ArrayOutOfMemory)
POP_COOP_PINVOKE_FRAME
EPILOG_RETURN
-ArrayOutOfMemory:
+LOCAL_LABEL(ArrayOutOfMemory):
// This is the OOM failure path. We are going to tail-call to a managed helper that will throw
// an out of memory exception that the caller of this allocator understands.
diff --git a/src/coreclr/nativeaot/Runtime/arm64/ExceptionHandling.S b/src/coreclr/nativeaot/Runtime/arm64/ExceptionHandling.S
index d0425171e1d191..7c04f15ad3b858 100644
--- a/src/coreclr/nativeaot/Runtime/arm64/ExceptionHandling.S
+++ b/src/coreclr/nativeaot/Runtime/arm64/ExceptionHandling.S
@@ -275,7 +275,7 @@
// where the tail-calling thread had saved LR, which may not match where we have saved LR.
ldr x1, [x2, #OFFSETOF__Thread__m_pvHijackedReturnAddress]
- cbz x1, NotHijacked
+ cbz x1, LOCAL_LABEL(NotHijacked)
ldr x3, [x2, #OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation]
@@ -286,13 +286,13 @@
add x12, sp, #(STACKSIZEOF_ExInfo + SIZEOF__PAL_LIMITED_CONTEXT) // re-compute SP at callsite
cmp x3, x12 // if (m_ppvHijackedReturnAddressLocation < SP at callsite)
- blo TailCallWasHijacked
+ blo LOCAL_LABEL(TailCallWasHijacked)
// normal case where a valid return address location is hijacked
str x1, [x3]
- b ClearThreadState
+ b LOCAL_LABEL(ClearThreadState)
-TailCallWasHijacked:
+LOCAL_LABEL(TailCallWasHijacked):
// Abnormal case where the return address location is now invalid because we ended up here via a tail
// call. In this case, our hijacked return address should be the correct caller of this method.
@@ -302,13 +302,13 @@ TailCallWasHijacked:
str lr, [sp, #(rsp_offsetof_Context + OFFSETOF__PAL_LIMITED_CONTEXT__LR)]
str lr, [sp, #(rsp_offsetof_Context + OFFSETOF__PAL_LIMITED_CONTEXT__IP)]
-ClearThreadState:
+LOCAL_LABEL(ClearThreadState):
// clear the Thread's hijack state
str xzr, [x2, #OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation]
str xzr, [x2, #OFFSETOF__Thread__m_pvHijackedReturnAddress]
-NotHijacked:
+LOCAL_LABEL(NotHijacked):
add x1, sp, #rsp_offsetof_ExInfo // x1 <- ExInfo*
str xzr, [x1, #OFFSETOF__ExInfo__m_exception] // pExInfo->m_exception = null
@@ -429,13 +429,13 @@ NotHijacked:
add x12, x5, #OFFSETOF__Thread__m_ThreadStateFlags
-ClearRetry_Catch:
+LOCAL_LABEL(ClearRetry_Catch):
ldxr w4, [x12]
bic w4, w4, #TSF_DoNotTriggerGc
stxr w6, w4, [x12]
- cbz w6, ClearSuccess_Catch
- b ClearRetry_Catch
-ClearSuccess_Catch:
+ cbz w6, LOCAL_LABEL(ClearSuccess_Catch)
+ b LOCAL_LABEL(ClearRetry_Catch)
+LOCAL_LABEL(ClearSuccess_Catch):
//
// set preserved regs to the values expected by the funclet
@@ -487,21 +487,21 @@ ClearSuccess_Catch:
ldr x3, [sp, #rsp_offset_x3] // x3 <- current ExInfo*
ldr x2, [x2, #OFFSETOF__REGDISPLAY__SP] // x2 <- resume SP value
-PopExInfoLoop:
+LOCAL_LABEL(PopExInfoLoop):
ldr x3, [x3, #OFFSETOF__ExInfo__m_pPrevExInfo] // x3 <- next ExInfo
- cbz x3, DonePopping // if (pExInfo == null) { we're done }
+ cbz x3, LOCAL_LABEL(DonePopping) // if (pExInfo == null) { we're done }
cmp x3, x2
- blt PopExInfoLoop // if (pExInfo < resume SP} { keep going }
+ blt LOCAL_LABEL(PopExInfoLoop) // if (pExInfo < resume SP} { keep going }
-DonePopping:
+LOCAL_LABEL(DonePopping):
str x3, [x1, #OFFSETOF__Thread__m_pExInfoStackHead] // store the new head on the Thread
PREPARE_EXTERNAL_VAR_INDIRECT_W RhpTrapThreads, 3
- tbz x3, #TrapThreadsFlags_AbortInProgress_Bit, NoAbort
+ tbz x3, #TrapThreadsFlags_AbortInProgress_Bit, LOCAL_LABEL(NoAbort)
ldr x3, [sp, #rsp_offset_is_not_handling_thread_abort]
- cbnz x3, NoAbort
+ cbnz x3, LOCAL_LABEL(NoAbort)
// It was the ThreadAbortException, so rethrow it
// reset SP
@@ -510,7 +510,7 @@ DonePopping:
mov sp, x2
b C_FUNC(RhpThrowHwEx)
-NoAbort:
+LOCAL_LABEL(NoAbort):
// reset SP and jump to continuation address
mov sp, x2
br x0
@@ -564,13 +564,13 @@ NoAbort:
add x12, x2, #OFFSETOF__Thread__m_ThreadStateFlags
-ClearRetry:
+LOCAL_LABEL(ClearRetry):
ldxr w4, [x12]
bic w4, w4, #TSF_DoNotTriggerGc
stxr w3, w4, [x12]
- cbz w3, ClearSuccess
- b ClearRetry
-ClearSuccess:
+ cbz w3, LOCAL_LABEL(ClearSuccess)
+ b LOCAL_LABEL(ClearRetry)
+LOCAL_LABEL(ClearSuccess):
//
// set preserved regs to the values expected by the funclet
@@ -602,13 +602,13 @@ ClearSuccess:
ldr x2, [sp, rsp_FinallyFunclet_offset_thread]
add x12, x2, #OFFSETOF__Thread__m_ThreadStateFlags
-SetRetry:
+LOCAL_LABEL(SetRetry):
ldxr w1, [x12]
orr w1, w1, #TSF_DoNotTriggerGc
stxr w3, w1, [x12]
- cbz w3, SetSuccess
- b SetRetry
-SetSuccess:
+ cbz w3, LOCAL_LABEL(SetSuccess)
+ b LOCAL_LABEL(SetRetry)
+LOCAL_LABEL(SetSuccess):
ldp d8, d9, [sp, #0x00]
ldp d10, d11, [sp, #0x10]
@@ -707,13 +707,13 @@ SetSuccess:
add x12, x5, #OFFSETOF__Thread__m_ThreadStateFlags
-ClearRetry_Propagate:
+LOCAL_LABEL(ClearRetry_Propagate):
ldxr w4, [x12]
bic w4, w4, #TSF_DoNotTriggerGc
stxr w6, w4, [x12]
- cbz w6, ClearSuccess_Propagate
- b ClearRetry_Propagate
-ClearSuccess_Propagate:
+ cbz w6, LOCAL_LABEL(ClearSuccess_Propagate)
+ b LOCAL_LABEL(ClearRetry_Propagate)
+LOCAL_LABEL(ClearSuccess_Propagate):
//
// set preserved regs to the values expected by the funclet
@@ -749,13 +749,13 @@ ClearSuccess_Propagate:
ldr x3, [sp, #rsp_offset_x3] // x3 <- current ExInfo*
ldr x2, [x2, #OFFSETOF__REGDISPLAY__SP] // x2 <- resume SP value
-Propagate_PopExInfoLoop:
+LOCAL_LABEL(Propagate_PopExInfoLoop):
ldr x3, [x3, #OFFSETOF__ExInfo__m_pPrevExInfo] // x3 <- next ExInfo
- cbz x3, Propagate_DonePopping // if (pExInfo == null) { we're done }
+ cbz x3, LOCAL_LABEL(Propagate_DonePopping) // if (pExInfo == null) { we're done }
cmp x3, x2
- blt Propagate_PopExInfoLoop // if (pExInfo < resume SP} { keep going }
+ blt LOCAL_LABEL(Propagate_PopExInfoLoop) // if (pExInfo < resume SP} { keep going }
-Propagate_DonePopping:
+LOCAL_LABEL(Propagate_DonePopping):
str x3, [x1, #OFFSETOF__Thread__m_pExInfoStackHead] // store the new head on the Thread
// restore preemptive mode
diff --git a/src/coreclr/nativeaot/Runtime/arm64/GcProbe.S b/src/coreclr/nativeaot/Runtime/arm64/GcProbe.S
index e27834bae6fedd..abe7555b761134 100644
--- a/src/coreclr/nativeaot/Runtime/arm64/GcProbe.S
+++ b/src/coreclr/nativeaot/Runtime/arm64/GcProbe.S
@@ -127,10 +127,10 @@ NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
FixupHijackedCallstack
PREPARE_EXTERNAL_VAR_INDIRECT_W RhpTrapThreads, 3
- tbnz x3, #TrapThreadsFlags_TrapThreads_Bit, WaitForGC
+ tbnz x3, #TrapThreadsFlags_TrapThreads_Bit, LOCAL_LABEL(WaitForGC)
ret
-WaitForGC:
+LOCAL_LABEL(WaitForGC):
orr x12, x12, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_X0 + PTFF_SAVE_X1
b C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack
@@ -144,11 +144,11 @@ NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
bl C_FUNC(RhpWaitForGC2)
ldr x2, [sp, #OFFSETOF__PInvokeTransitionFrame__m_Flags]
- tbnz x2, #PTFF_THREAD_ABORT_BIT, ThrowThreadAbort
+ tbnz x2, #PTFF_THREAD_ABORT_BIT, LOCAL_LABEL(ThrowThreadAbort)
POP_PROBE_FRAME
EPILOG_RETURN
-ThrowThreadAbort:
+LOCAL_LABEL(ThrowThreadAbort):
POP_PROBE_FRAME
mov w0, #STATUS_REDHAWK_THREAD_ABORT
mov x1, lr // return address as exception PC
@@ -159,8 +159,10 @@ NESTED_END RhpWaitForGC
LEAF_ENTRY RhpGcPoll
PREPARE_EXTERNAL_VAR_INDIRECT_W RhpTrapThreads, 0
- cbnz w0, C_FUNC(RhpGcPollRare) // TrapThreadsFlags_None = 0
+ cbnz w0, LOCAL_LABEL(RhpGcPoll_Rare) // TrapThreadsFlags_None = 0
ret
+LOCAL_LABEL(RhpGcPoll_Rare):
+ b C_FUNC(RhpGcPollRare)
LEAF_END RhpGcPoll
NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
diff --git a/src/coreclr/nativeaot/Runtime/arm64/WriteBarriers.S b/src/coreclr/nativeaot/Runtime/arm64/WriteBarriers.S
index d00ffb3a4a9978..835466c3b9e7e4 100644
--- a/src/coreclr/nativeaot/Runtime/arm64/WriteBarriers.S
+++ b/src/coreclr/nativeaot/Runtime/arm64/WriteBarriers.S
@@ -224,9 +224,11 @@ LEAF_END RhpByRefAssignRefArm64, _TEXT
PREPARE_EXTERNAL_VAR_INDIRECT g_highest_address, x12
ccmp x14, x12, #0x2, hs
- blo C_FUNC(RhpAssignRefArm64)
+ bhs LOCAL_LABEL(NotInHeap)
-NotInHeap:
+ b C_FUNC(RhpAssignRefArm64)
+
+LOCAL_LABEL(NotInHeap):
ALTERNATE_ENTRY RhpCheckedAssignRefAVLocation
str x15, [x14], 8
ret
@@ -293,44 +295,44 @@ LEAF_END RhpAssignRef, _TEXT
#ifndef LSE_INSTRUCTIONS_ENABLED_BY_DEFAULT
PREPARE_EXTERNAL_VAR_INDIRECT_W g_cpuFeatures, 16
- tbz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, CmpXchgRetry
+ tbz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, LOCAL_LABEL(CmpXchgRetry)
#endif
mov x10, x2
ALTERNATE_ENTRY RhpCheckedLockCmpXchgAVLocation
casal x10, x1, [x0] // exchange
cmp x2, x10
- bne CmpXchgNoUpdate
+ bne LOCAL_LABEL(CmpXchgNoUpdate)
#ifndef LSE_INSTRUCTIONS_ENABLED_BY_DEFAULT
- b DoCardsCmpXchg
-CmpXchgRetry:
+ b LOCAL_LABEL(DoCardsCmpXchg)
+LOCAL_LABEL(CmpXchgRetry):
// Check location value is what we expect.
ALTERNATE_ENTRY RhpCheckedLockCmpXchgAVLocation2
ldaxr x10, [x0]
cmp x10, x2
- bne CmpXchgNoUpdate
+ bne LOCAL_LABEL(CmpXchgNoUpdate)
// Current value matches comparand, attempt to update with the new value.
stlxr w12, x1, [x0]
- cbnz w12, CmpXchgRetry
+ cbnz w12, LOCAL_LABEL(CmpXchgRetry)
#endif
-DoCardsCmpXchg:
+LOCAL_LABEL(DoCardsCmpXchg):
// We have successfully updated the value of the objectref so now we need a GC write barrier.
// The following barrier code takes the destination in x0 and the value in x1 so the arguments are
// already correctly set up.
INSERT_CHECKED_WRITE_BARRIER_CORE x0, x1
-CmpXchgNoUpdate:
+LOCAL_LABEL(CmpXchgNoUpdate):
// x10 still contains the original value.
mov x0, x10
#ifndef LSE_INSTRUCTIONS_ENABLED_BY_DEFAULT
- tbnz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, NoBarrierCmpXchg
+ tbnz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, LOCAL_LABEL(NoBarrierCmpXchg)
InterlockedOperationBarrier
-NoBarrierCmpXchg:
+LOCAL_LABEL(NoBarrierCmpXchg):
#endif
ret lr
@@ -357,25 +359,25 @@ NoBarrierCmpXchg:
#ifndef LSE_INSTRUCTIONS_ENABLED_BY_DEFAULT
PREPARE_EXTERNAL_VAR_INDIRECT_W g_cpuFeatures, 16
- tbz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, ExchangeRetry
+ tbz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, LOCAL_LABEL(ExchangeRetry)
#endif
ALTERNATE_ENTRY RhpCheckedXchgAVLocation
swpal x1, x10, [x0] // exchange
#ifndef LSE_INSTRUCTIONS_ENABLED_BY_DEFAULT
- b DoCardsXchg
-ExchangeRetry:
+ b LOCAL_LABEL(DoCardsXchg)
+LOCAL_LABEL(ExchangeRetry):
// Read the existing memory location.
ALTERNATE_ENTRY RhpCheckedXchgAVLocation2
ldaxr x10, [x0]
// Attempt to update with the new value.
stlxr w12, x1, [x0]
- cbnz w12, ExchangeRetry
+ cbnz w12, LOCAL_LABEL(ExchangeRetry)
#endif
-DoCardsXchg:
+LOCAL_LABEL(DoCardsXchg):
// We have successfully updated the value of the objectref so now we need a GC write barrier.
// The following barrier code takes the destination in x0 and the value in x1 so the arguments are
// already correctly set up.
@@ -386,9 +388,9 @@ DoCardsXchg:
mov x0, x10
#ifndef LSE_INSTRUCTIONS_ENABLED_BY_DEFAULT
- tbnz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, NoBarrierXchg
+ tbnz w16, #ARM64_ATOMICS_FEATURE_FLAG_BIT, LOCAL_LABEL(NoBarrierXchg)
InterlockedOperationBarrier
-NoBarrierXchg:
+LOCAL_LABEL(NoBarrierXchg):
#endif
ret
diff --git a/src/coreclr/nativeaot/Runtime/gcrhenv.cpp b/src/coreclr/nativeaot/Runtime/gcrhenv.cpp
index 3d0990962b7c99..3ec488605c1b33 100644
--- a/src/coreclr/nativeaot/Runtime/gcrhenv.cpp
+++ b/src/coreclr/nativeaot/Runtime/gcrhenv.cpp
@@ -42,7 +42,6 @@
#include "daccess.h"
-#include "GCMemoryHelpers.h"
#include "interoplibinterface.h"
#include "holder.h"
diff --git a/src/coreclr/nativeaot/Runtime/portable.cpp b/src/coreclr/nativeaot/Runtime/portable.cpp
index d45b3d062d00e3..8b425bfe2dff12 100644
--- a/src/coreclr/nativeaot/Runtime/portable.cpp
+++ b/src/coreclr/nativeaot/Runtime/portable.cpp
@@ -31,7 +31,6 @@
#include "MethodTable.inl"
#include "ObjectLayout.h"
-#include "GCMemoryHelpers.h"
#include "GCMemoryHelpers.inl"
#if defined(USE_PORTABLE_HELPERS)
diff --git a/src/coreclr/nativeaot/Runtime/startup.cpp b/src/coreclr/nativeaot/Runtime/startup.cpp
index 32cbab53cb8304..5db04aa27766dd 100644
--- a/src/coreclr/nativeaot/Runtime/startup.cpp
+++ b/src/coreclr/nativeaot/Runtime/startup.cpp
@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif
+#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
+bool g_safeToShutdownTracing;
+#endif
+
static void __cdecl OnProcessExit()
{
#ifdef _WIN32
@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif
#ifdef FEATURE_PERFTRACING
- EventPipe_Shutdown();
- DiagnosticServer_Shutdown();
+#ifdef _WIN32
+ // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
+ // If there was an active trace session, the trace will likely be corrupted without
+ // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
+ if (g_safeToShutdownTracing)
+#endif
+ {
+ EventPipe_Shutdown();
+ DiagnosticServer_Shutdown();
+ }
#endif
}
@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}
-extern "C" bool RhInitialize()
+extern "C" bool RhInitialize(bool isDll)
{
if (!PalInit())
return false;
@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
atexit(&OnProcessExit);
#endif
+#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
+ g_safeToShutdownTracing = !isDll;
+#endif
+
if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
return false;
diff --git a/src/coreclr/nativeaot/Runtime/threadstore.cpp b/src/coreclr/nativeaot/Runtime/threadstore.cpp
index 67a6949fd7fb06..2e8369f9175fc5 100644
--- a/src/coreclr/nativeaot/Runtime/threadstore.cpp
+++ b/src/coreclr/nativeaot/Runtime/threadstore.cpp
@@ -24,7 +24,6 @@
#include "yieldprocessornormalized.h"
#include "slist.inl"
-#include "GCMemoryHelpers.h"
EXTERN_C volatile uint32_t RhpTrapThreads;
volatile uint32_t RhpTrapThreads = (uint32_t)TrapThreadsFlags::None;
diff --git a/src/coreclr/nativeaot/Runtime/unix/unixasmmacros.inc b/src/coreclr/nativeaot/Runtime/unix/unixasmmacros.inc
index ef6d393fd248b1..bde1d517b7e823 100644
--- a/src/coreclr/nativeaot/Runtime/unix/unixasmmacros.inc
+++ b/src/coreclr/nativeaot/Runtime/unix/unixasmmacros.inc
@@ -3,6 +3,11 @@
#define INVALIDGCVALUE 0xCCCCCCCD
+// Enforce subsections via symbols to workaround bugs in Xcode 15 linker.
+#if defined(__APPLE__)
+.subsections_via_symbols
+#endif
+
#if defined(__APPLE__)
#define C_FUNC(name) _##name
#define EXTERNAL_C_FUNC(name) C_FUNC(name)
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/GC.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/GC.NativeAot.cs
index 5ebcfc6c0771c1..3d263d5de6b63d 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/GC.NativeAot.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/GC.NativeAot.cs
@@ -869,7 +869,6 @@ public static TimeSpan GetTotalPauseDuration()
return new TimeSpan(RuntimeImports.RhGetTotalPauseDuration());
}
- [System.Runtime.Versioning.RequiresPreviewFeaturesAttribute("RefreshMemoryLimit is in preview.")]
public static void RefreshMemoryLimit()
{
ulong heapHardLimit = (AppContext.GetData("GCHeapHardLimit") as ulong?) ?? ulong.MaxValue;
diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.MetadataSignatureParsing.cs b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.MetadataSignatureParsing.cs
index 07674dded3541c..1a1cd76cc4ddfd 100644
--- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.MetadataSignatureParsing.cs
+++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.MetadataSignatureParsing.cs
@@ -173,12 +173,23 @@ internal static NativeParser GetNativeParserForSignature(RuntimeSignature signat
private bool CompareTypeSigWithType(ref NativeParser parser, TypeManagerHandle moduleHandle, Handle typeHandle)
{
- while (typeHandle.HandleType == HandleType.TypeSpecification)
+ while (typeHandle.HandleType == HandleType.TypeSpecification
+ || typeHandle.HandleType == HandleType.ModifiedType)
{
- typeHandle = typeHandle
- .ToTypeSpecificationHandle(_metadataReader)
- .GetTypeSpecification(_metadataReader)
- .Signature;
+ if (typeHandle.HandleType == HandleType.TypeSpecification)
+ {
+ typeHandle = typeHandle
+ .ToTypeSpecificationHandle(_metadataReader)
+ .GetTypeSpecification(_metadataReader)
+ .Signature;
+ }
+ else
+ {
+ typeHandle = typeHandle
+ .ToModifiedTypeHandle(_metadataReader)
+ .GetModifiedType(_metadataReader)
+ .Type;
+ }
}
// startOffset lets us backtrack to the TypeSignatureKind for external types since the TypeLoader
diff --git a/src/coreclr/pal/inc/unixasmmacros.inc b/src/coreclr/pal/inc/unixasmmacros.inc
index 658a65bb4b35aa..120b26543e3faa 100644
--- a/src/coreclr/pal/inc/unixasmmacros.inc
+++ b/src/coreclr/pal/inc/unixasmmacros.inc
@@ -3,6 +3,11 @@
#define INVALIDGCVALUE 0xCCCCCCCD
+// Enforce subsections via symbols to workaround bugs in Xcode 15 linker.
+#if defined(__APPLE__)
+.subsections_via_symbols
+#endif
+
#if defined(__APPLE__)
#define C_FUNC(name) _##name
#define EXTERNAL_C_FUNC(name) C_FUNC(name)
diff --git a/src/coreclr/tools/Common/CommandLineHelpers.cs b/src/coreclr/tools/Common/CommandLineHelpers.cs
index 205592c1c91dca..3fb977a3047a6a 100644
--- a/src/coreclr/tools/Common/CommandLineHelpers.cs
+++ b/src/coreclr/tools/Common/CommandLineHelpers.cs
@@ -210,7 +210,7 @@ public static void MakeReproPackage(string makeReproPath, string outputFilePath,
foreach (CliOption option in res.CommandResult.Command.Options)
{
OptionResult optionResult = res.GetResult(option);
- if (optionResult is null || option.Name == "make-repro-path")
+ if (optionResult is null || option.Name == "--make-repro-path")
{
continue;
}
@@ -233,7 +233,7 @@ public static void MakeReproPackage(string makeReproPath, string outputFilePath,
}
foreach (string inputFile in dictionary.Values)
{
- rspFile.Add($"--{option.Name}:{ConvertFromOriginalPathToReproPackagePath(input: true, inputFile)}");
+ rspFile.Add($"{option.Name}:{ConvertFromOriginalPathToReproPackagePath(input: true, inputFile)}");
}
}
else
@@ -241,7 +241,7 @@ public static void MakeReproPackage(string makeReproPath, string outputFilePath,
foreach (string optInList in values)
{
if (!string.IsNullOrEmpty(optInList))
- rspFile.Add($"--{option.Name}:{optInList}");
+ rspFile.Add($"{option.Name}:{optInList}");
}
}
}
@@ -254,11 +254,11 @@ public static void MakeReproPackage(string makeReproPath, string outputFilePath,
// if output option is used, overwrite the path to the repro package
stringVal = ConvertFromOriginalPathToReproPackagePath(input: false, stringVal);
}
- rspFile.Add($"--{option.Name}:{stringVal}");
+ rspFile.Add($"{option.Name}:{stringVal}");
}
else
{
- rspFile.Add($"--{option.Name}:{val}");
+ rspFile.Add($"{option.Name}:{val}");
}
}
}
diff --git a/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs b/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs
index 8d2b8a4e3fd3fe..330296b18dbfa4 100644
--- a/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs
+++ b/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs
@@ -614,6 +614,8 @@ private static MethodDesc ResolveInterfaceMethodToVirtualMethodOnType(MethodDesc
{
Debug.Assert(!interfaceMethod.Signature.IsStatic);
+ // This would be a default interface method resolution. The algorithm below would sort of work, but doesn't handle
+ // things like diamond cases and it's better not to let it resolve as such.
if (currentType.IsInterface)
return null;
@@ -781,7 +783,7 @@ private static DefaultInterfaceMethodResolution ResolveInterfaceMethodToDefaultI
// If we're asking about an interface, include the interface in the list.
consideredInterfaces = new DefType[currentType.RuntimeInterfaces.Length + 1];
Array.Copy(currentType.RuntimeInterfaces, consideredInterfaces, currentType.RuntimeInterfaces.Length);
- consideredInterfaces[consideredInterfaces.Length - 1] = (DefType)currentType.InstantiateAsOpen();
+ consideredInterfaces[consideredInterfaces.Length - 1] = currentType.IsGenericDefinition ? (DefType)currentType.InstantiateAsOpen() : currentType;
}
foreach (MetadataType runtimeInterface in consideredInterfaces)
@@ -921,6 +923,11 @@ public static IEnumerable EnumAllVirtualSlots(MetadataType type)
/// MethodDesc of the resolved virtual static method, null when not found (runtime lookup must be used)
public static MethodDesc ResolveInterfaceMethodToStaticVirtualMethodOnType(MethodDesc interfaceMethod, MetadataType currentType)
{
+ // This would be a default interface method resolution. The algorithm below would sort of work, but doesn't handle
+ // things like diamond cases and it's better not to let it resolve as such.
+ if (currentType.IsInterface)
+ return null;
+
// Search for match on a per-level in the type hierarchy
for (MetadataType typeToCheck = currentType; typeToCheck != null; typeToCheck = typeToCheck.MetadataBaseType)
{
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/CompilerGeneratedState.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/CompilerGeneratedState.cs
index 8150abeca61b1e..6a5e2ed77cdf08 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/CompilerGeneratedState.cs
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/CompilerGeneratedState.cs
@@ -158,8 +158,10 @@ referencedMethod.OwningType is MetadataType generatedType &&
break;
case ILOpcode.stsfld:
+ case ILOpcode.ldsfld:
{
// Same as above, but stsfld instead of a call to the constructor
+ // Ldsfld may also trigger a cctor that creates a closure environment
FieldDesc? field = methodBody.GetObject(reader.ReadILToken()) as FieldDesc;
if (field == null)
continue;
@@ -417,6 +419,7 @@ void MapGeneratedTypeTypeParameters(
break;
case ILOpcode.stsfld:
+ case ILOpcode.ldsfld:
{
if (body.GetObject(reader.ReadILToken()) is FieldDesc { OwningType: MetadataType owningType }
&& compilerGeneratedType == owningType.GetTypeDefinition())
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs
index 1e9f7679b44cc3..61520b4bfadaff 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs
@@ -372,16 +372,8 @@ public sealed override IEnumerable GetConditionalSt
DefType defType = _type.GetClosestDefType();
- // Interfaces don't have vtables and we don't need to track their slot use.
- // The only exception are those interfaces that provide IDynamicInterfaceCastable implementations;
- // those have slots and we dispatch on them.
- bool needsDependenciesForVirtualMethodImpls = !defType.IsInterface
- || ((MetadataType)defType).IsDynamicInterfaceCastableImplementation();
-
// If we're producing a full vtable, none of the dependencies are conditional.
- needsDependenciesForVirtualMethodImpls &= !factory.VTable(defType).HasFixedSlots;
-
- if (needsDependenciesForVirtualMethodImpls)
+ if (!factory.VTable(defType).HasFixedSlots)
{
bool isNonInterfaceAbstractType = !defType.IsInterface && ((MetadataType)defType).IsAbstract;
@@ -436,6 +428,12 @@ public sealed override IEnumerable GetConditionalSt
((System.Collections.IStructuralEquatable)defType.RuntimeInterfaces).Equals(_type.RuntimeInterfaces,
EqualityComparer.Default));
+ // Interfaces don't have vtables and we don't need to track their instance method slot use.
+ // The only exception are those interfaces that provide IDynamicInterfaceCastable implementations;
+ // those have slots and we dispatch on them.
+ bool needsDependenciesForInstanceInterfaceMethodImpls = !defType.IsInterface
+ || ((MetadataType)defType).IsDynamicInterfaceCastableImplementation();
+
// Add conditional dependencies for interface methods the type implements. For example, if the type T implements
// interface IFoo which has a method M1, add a dependency on T.M1 dependent on IFoo.M1 being called, since it's
// possible for any IFoo object to actually be an instance of T.
@@ -456,6 +454,9 @@ public sealed override IEnumerable GetConditionalSt
bool isStaticInterfaceMethod = interfaceMethod.Signature.IsStatic;
+ if (!isStaticInterfaceMethod && !needsDependenciesForInstanceInterfaceMethodImpls)
+ continue;
+
MethodDesc implMethod = isStaticInterfaceMethod ?
defType.ResolveInterfaceMethodToStaticVirtualMethodOnType(interfaceMethod) :
defType.ResolveInterfaceMethodToVirtualMethodOnType(interfaceMethod);
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs
index 38104d7ab015c9..c2ac4568c748c9 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs
@@ -73,7 +73,7 @@ public static bool MightHaveInterfaceDispatchMap(TypeDesc type, NodeFactory fact
if (!type.IsArray && !type.IsDefType)
return false;
- // Interfaces don't have a dispatch map because we dispatch them based on the
+ // Interfaces don't have a dispatch map for instance methods because we dispatch them based on the
// dispatch map of the implementing class.
// The only exception are IDynamicInterfaceCastable scenarios that dispatch
// using the interface dispatch map.
@@ -83,8 +83,9 @@ public static bool MightHaveInterfaceDispatchMap(TypeDesc type, NodeFactory fact
// wasn't marked as [DynamicInterfaceCastableImplementation]" and "we couldn't find an
// implementation". We don't want to use the custom attribute for that at runtime because
// that's reflection and this should work without reflection.
- if (type.IsInterface)
- return ((MetadataType)type).IsDynamicInterfaceCastableImplementation();
+ bool isInterface = type.IsInterface;
+ if (isInterface && ((MetadataType)type).IsDynamicInterfaceCastableImplementation())
+ return true;
DefType declType = type.GetClosestDefType();
@@ -112,6 +113,11 @@ public static bool MightHaveInterfaceDispatchMap(TypeDesc type, NodeFactory fact
Debug.Assert(declMethod.IsVirtual);
+ // Only static methods get placed in dispatch maps of interface types (modulo
+ // IDynamicInterfaceCastable we already handled above).
+ if (isInterface && !declMethod.Signature.IsStatic)
+ continue;
+
if (interfaceOnDefinitionType != null)
declMethod = factory.TypeSystemContext.GetMethodForInstantiatedType(declMethod.GetTypicalMethodDefinition(), interfaceOnDefinitionType);
@@ -154,6 +160,10 @@ private void EmitDispatchMap(ref ObjectDataBuilder builder, NodeFactory factory)
var staticImplementations = new List<(int InterfaceIndex, int InterfaceMethodSlot, int ImplMethodSlot, int Context)>();
var staticDefaultImplementations = new List<(int InterfaceIndex, int InterfaceMethodSlot, int ImplMethodSlot, int Context)>();
+ bool isInterface = declType.IsInterface;
+ bool needsEntriesForInstanceInterfaceMethodImpls = !isInterface
+ || ((MetadataType)declType).IsDynamicInterfaceCastableImplementation();
+
// Resolve all the interfaces, but only emit non-static and non-default implementations
for (int interfaceIndex = 0; interfaceIndex < declTypeRuntimeInterfaces.Length; interfaceIndex++)
{
@@ -166,6 +176,10 @@ private void EmitDispatchMap(ref ObjectDataBuilder builder, NodeFactory factory)
for (int interfaceMethodSlot = 0; interfaceMethodSlot < virtualSlots.Count; interfaceMethodSlot++)
{
MethodDesc declMethod = virtualSlots[interfaceMethodSlot];
+
+ if (!declMethod.Signature.IsStatic && !needsEntriesForInstanceInterfaceMethodImpls)
+ continue;
+
if(!interfaceType.IsTypeDefinition)
declMethod = factory.TypeSystemContext.GetMethodForInstantiatedType(declMethod.GetTypicalMethodDefinition(), (InstantiatedType)interfaceDefinitionType);
@@ -244,9 +258,17 @@ private void EmitDispatchMap(ref ObjectDataBuilder builder, NodeFactory factory)
// For default interface methods, the generic context is acquired by indexing
// into the interface list of the owning type.
Debug.Assert(providingInterfaceDefinitionType != null);
- int indexOfInterface = Array.IndexOf(declTypeDefinitionRuntimeInterfaces, providingInterfaceDefinitionType);
- Debug.Assert(indexOfInterface >= 0);
- genericContext = StaticVirtualMethodContextSource.ContextFromFirstInterface + indexOfInterface;
+ if (declTypeDefinition.HasSameTypeDefinition(providingInterfaceDefinitionType) &&
+ providingInterfaceDefinitionType == declTypeDefinition.InstantiateAsOpen())
+ {
+ genericContext = StaticVirtualMethodContextSource.ContextFromThisClass;
+ }
+ else
+ {
+ int indexOfInterface = Array.IndexOf(declTypeDefinitionRuntimeInterfaces, providingInterfaceDefinitionType);
+ Debug.Assert(indexOfInterface >= 0);
+ genericContext = StaticVirtualMethodContextSource.ContextFromFirstInterface + indexOfInterface;
+ }
}
staticDefaultImplementations.Add((
interfaceIndex,
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SealedVTableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SealedVTableNode.cs
index bb67f884264dd3..a8460e80d0b413 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SealedVTableNode.cs
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SealedVTableNode.cs
@@ -108,17 +108,21 @@ public bool BuildSealedVTableSlots(NodeFactory factory, bool relocsOnly)
_sealedVTableEntries = new List();
- // Interfaces don't have any virtual slots with the exception of interfaces that provide
+ // Interfaces don't have any instance virtual slots with the exception of interfaces that provide
// IDynamicInterfaceCastable implementation.
// Normal interface don't need one because the dispatch is done at the class level.
// For IDynamicInterfaceCastable, we don't have an implementing class.
- if (_type.IsInterface && !((MetadataType)_type).IsDynamicInterfaceCastableImplementation())
- return true;
+ bool isInterface = declType.IsInterface;
+ bool needsEntriesForInstanceInterfaceMethodImpls = !isInterface
+ || ((MetadataType)declType).IsDynamicInterfaceCastableImplementation();
IReadOnlyList virtualSlots = factory.VTable(declType).Slots;
for (int i = 0; i < virtualSlots.Count; i++)
{
+ if (!virtualSlots[i].Signature.IsStatic && !needsEntriesForInstanceInterfaceMethodImpls)
+ continue;
+
MethodDesc implMethod = declType.FindVirtualFunctionTargetMethodOnObjectType(virtualSlots[i]);
if (implMethod.CanMethodBeInSealedVTable())
@@ -143,6 +147,10 @@ public bool BuildSealedVTableSlots(NodeFactory factory, bool relocsOnly)
for (int interfaceMethodSlot = 0; interfaceMethodSlot < virtualSlots.Count; interfaceMethodSlot++)
{
MethodDesc declMethod = virtualSlots[interfaceMethodSlot];
+
+ if (!declMethod.Signature.IsStatic && !needsEntriesForInstanceInterfaceMethodImpls)
+ continue;
+
if (!interfaceType.IsTypeDefinition)
declMethod = factory.TypeSystemContext.GetMethodForInstantiatedType(declMethod.GetTypicalMethodDefinition(), (InstantiatedType)interfaceDefinitionType);
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedMetadataManager.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedMetadataManager.cs
index e680bf80f2dfa7..0d4a855e736ed0 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedMetadataManager.cs
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedMetadataManager.cs
@@ -1093,7 +1093,7 @@ private void ProcessAttribute(TypeDesc type, XPathNavigator nav)
string internalValue = GetAttribute(nav, "internal");
if (!string.IsNullOrEmpty(internalValue))
{
- if (!IsRemoveAttributeInstances(internalValue) || !nav.IsEmptyElement)
+ if (!IsRemoveAttributeInstances(internalValue))
{
LogWarning(nav, DiagnosticId.UnrecognizedInternalAttribute, internalValue);
}
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/VirtualMethodCallHelper.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/VirtualMethodCallHelper.cs
index a9de1fce5e3a52..ec398d37433966 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/VirtualMethodCallHelper.cs
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/VirtualMethodCallHelper.cs
@@ -93,9 +93,8 @@ private static int GetNumberOfSlotsInCurrentType(NodeFactory factory, TypeDesc i
{
if (implType.IsInterface)
{
- // We normally don't need to ask about vtable slots of interfaces. It's not wrong to ask
- // that question, but we currently only ask it for IDynamicInterfaceCastable implementations.
- Debug.Assert(((MetadataType)implType).IsDynamicInterfaceCastableImplementation());
+ // Interface types don't have physically assigned virtual slots, so the number of slots
+ // is always 0. They may have sealed slots.
return (implType.HasGenericDictionarySlot() && countDictionarySlots) ? 1 : 0;
}
diff --git a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs
index 07147b1110323d..31cd4455663e2e 100644
--- a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs
+++ b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs
@@ -29,6 +29,11 @@ public static IEnumerable Generics ()
return TestNamesBySuiteName ();
}
+ public static IEnumerable InlineArrays ()
+ {
+ return TestNamesBySuiteName();
+ }
+
public static IEnumerable LinkXml()
{
return TestNamesBySuiteName();
diff --git a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs
index 883582cc5d9df2..744fb23e416f98 100644
--- a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs
+++ b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs
@@ -30,6 +30,13 @@ public void Generics (string t)
Run (t);
}
+ [Theory]
+ [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
+ public void InlineArrays(string t)
+ {
+ Run(t);
+ }
+
[Theory]
[MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
public void LinkXml (string t)
diff --git a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs
index e97a51a5c2c737..6441776f33ad01 100644
--- a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs
+++ b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs
@@ -129,9 +129,11 @@ public virtual IEnumerable GetCommonReferencedAssemblies (NPath workingD
yield return Path.Combine (referenceDir, "mscorlib.dll");
yield return Path.Combine (referenceDir, "System.Collections.dll");
+ yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
yield return Path.Combine (referenceDir, "System.Console.dll");
yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
+ yield return Path.Combine (referenceDir, "System.Memory.dll");
yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
yield return Path.Combine (referenceDir, "System.Runtime.dll");
yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
diff --git a/src/coreclr/utilcode/stresslog.cpp b/src/coreclr/utilcode/stresslog.cpp
index c55c5afe9249c8..90ad5900473ed7 100644
--- a/src/coreclr/utilcode/stresslog.cpp
+++ b/src/coreclr/utilcode/stresslog.cpp
@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
+#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
-#include "ex.h"
#if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
diff --git a/src/coreclr/vm/amd64/jithelpers_fast.S b/src/coreclr/vm/amd64/jithelpers_fast.S
index 32890b471b26c1..72f91a18061579 100644
--- a/src/coreclr/vm/amd64/jithelpers_fast.S
+++ b/src/coreclr/vm/amd64/jithelpers_fast.S
@@ -32,16 +32,16 @@ LEAF_ENTRY JIT_CheckedWriteBarrier, _TEXT
// See if this is in GCHeap
PREPARE_EXTERNAL_VAR g_lowest_address, rax
cmp rdi, [rax]
- // jb NotInHeap
+ // jb LOCAL_LABEL(NotInHeap)
.byte 0x72, 0x12
PREPARE_EXTERNAL_VAR g_highest_address, rax
cmp rdi, [rax]
- // jnb NotInHeap
+ // jnb LOCAL_LABEL(NotInHeap)
.byte 0x73, 0x06
jmp [rip + C_FUNC(JIT_WriteBarrier_Loc)]
- NotInHeap:
+ LOCAL_LABEL(NotInHeap):
// See comment above about possible AV
mov [rdi], rsi
ret
@@ -85,16 +85,16 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
add rax, r10
cmp byte ptr [rax], 0x0
.byte 0x75, 0x06
- // jne CheckCardTable
+ // jne LOCAL_LABEL(CheckCardTable)
mov byte ptr [rax], 0xFF
NOP_3_BYTE // padding for alignment of constant
// Check the lower and upper ephemeral region bounds
- CheckCardTable:
+ LOCAL_LABEL(CheckCardTable):
cmp rsi, r11
.byte 0x72,0x3D
- // jb Exit
+ // jb LOCAL_LABEL(Exit)
NOP_3_BYTE // padding for alignment of constant
@@ -102,7 +102,7 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
cmp rsi, r10
.byte 0x73,0x2B
- // jae Exit
+ // jae LOCAL_LABEL(Exit)
nop // padding for alignment of constant
@@ -112,10 +112,10 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
shr rdi, 0x0B
cmp byte ptr [rdi + rax], 0xFF
.byte 0x75, 0x02
- // jne UpdateCardTable
+ // jne LOCAL_LABEL(UpdateCardTable)
REPRET
- UpdateCardTable:
+ LOCAL_LABEL(UpdateCardTable):
mov byte ptr [rdi + rax], 0xFF
#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
@@ -126,17 +126,17 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
cmp byte ptr [rdi + rax], 0xFF
.byte 0x75, 0x02
- // jne UpdateCardBundle_WriteWatch_PostGrow64
+ // jne LOCAL_LABEL(UpdateCardBundle_WriteWatch_PostGrow64)
REPRET
- UpdateCardBundle_WriteWatch_PostGrow64:
+ LOCAL_LABEL(UpdateCardBundle_WriteWatch_PostGrow64):
mov byte ptr [rdi + rax], 0xFF
#endif
ret
.balign 16
- Exit:
+ LOCAL_LABEL(Exit):
REPRET
NOP_3_BYTE
@@ -184,7 +184,7 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
// Check the lower and upper ephemeral region bounds
cmp rsi, rax
- // jb Exit
+ // jb LOCAL_LABEL(Exit)
.byte 0x72, 0x36
nop // padding for alignment of constant
@@ -192,7 +192,7 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
movabs r8, 0xF0F0F0F0F0F0F0F0
cmp rsi, r8
- // jae Exit
+ // jae LOCAL_LABEL(Exit)
.byte 0x73, 0x26
nop // padding for alignment of constant
@@ -203,10 +203,10 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
shr rdi, 0Bh
cmp byte ptr [rdi + rax], 0FFh
.byte 0x75, 0x02
- // jne UpdateCardTable
+ // jne LOCAL_LABEL(UpdateCardTable)
REPRET
- UpdateCardTable:
+ LOCAL_LABEL(UpdateCardTable):
mov byte ptr [rdi + rax], 0FFh
#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
@@ -220,17 +220,17 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
cmp byte ptr [rdi + rax], 0FFh
.byte 0x75, 0x02
- // jne UpdateCardBundle
+ // jne LOCAL_LABEL(UpdateCardBundle)
REPRET
- UpdateCardBundle:
+ LOCAL_LABEL(UpdateCardBundle):
mov byte ptr [rdi + rax], 0FFh
#endif
ret
.balign 16
- Exit:
+ LOCAL_LABEL(Exit):
REPRET
#endif
@@ -277,30 +277,30 @@ LEAF_ENTRY JIT_ByRefWriteBarrier, _TEXT
// See if this is in GCHeap
PREPARE_EXTERNAL_VAR g_lowest_address, rax
cmp rdi, [rax]
- jb NotInHeap_ByRefWriteBarrier
+ jb LOCAL_LABEL(NotInHeap_ByRefWriteBarrier)
PREPARE_EXTERNAL_VAR g_highest_address, rax
cmp rdi, [rax]
- jnb NotInHeap_ByRefWriteBarrier
+ jnb LOCAL_LABEL(NotInHeap_ByRefWriteBarrier)
#ifdef WRITE_BARRIER_CHECK
// **ALSO update the shadow GC heap if that is enabled**
// Do not perform the work if g_GCShadow is 0
PREPARE_EXTERNAL_VAR g_GCShadow, rax
cmp qword ptr [rax], 0
- je NoShadow_ByRefWriteBarrier
+ je LOCAL_LABEL(NoShadow_ByRefWriteBarrier)
// If we end up outside of the heap don't corrupt random memory
mov r10, rdi
PREPARE_EXTERNAL_VAR g_lowest_address, rax
sub r10, [rax]
- jb NoShadow_ByRefWriteBarrier
+ jb LOCAL_LABEL(NoShadow_ByRefWriteBarrier)
// Check that our adjusted destination is somewhere in the shadow gc
PREPARE_EXTERNAL_VAR g_GCShadow, rax
add r10, [rax]
PREPARE_EXTERNAL_VAR g_GCShadowEnd, rax
cmp r10, [rax]
- jnb NoShadow_ByRefWriteBarrier
+ jnb LOCAL_LABEL(NoShadow_ByRefWriteBarrier)
// Write ref into real GC
mov [rdi], rcx
@@ -315,73 +315,73 @@ LEAF_ENTRY JIT_ByRefWriteBarrier, _TEXT
mov r11, [rdi]
mov rax, [r10]
cmp rax, r11
- je DoneShadow_ByRefWriteBarrier
+ je LOCAL_LABEL(DoneShadow_ByRefWriteBarrier)
movabs r11, INVALIDGCVALUE
mov [r10], r11
- jmp DoneShadow_ByRefWriteBarrier
+ jmp LOCAL_LABEL(DoneShadow_ByRefWriteBarrier)
// If we don't have a shadow GC we won't have done the write yet
- NoShadow_ByRefWriteBarrier:
+ LOCAL_LABEL(NoShadow_ByRefWriteBarrier):
mov [rdi], rcx
// If we had a shadow GC then we already wrote to the real GC at the same time
// as the shadow GC so we want to jump over the real write immediately above.
// Additionally we know for sure that we are inside the heap and therefore don't
// need to replicate the above checks.
- DoneShadow_ByRefWriteBarrier:
+ LOCAL_LABEL(DoneShadow_ByRefWriteBarrier):
#endif
#ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
// Update the write watch table if necessary
PREPARE_EXTERNAL_VAR g_sw_ww_enabled_for_gc_heap, rax
cmp byte ptr [rax], 0x0
- je CheckCardTable_ByRefWriteBarrier
+ je LOCAL_LABEL(CheckCardTable_ByRefWriteBarrier)
mov rax, rdi
shr rax, 0xC // SoftwareWriteWatch::AddressToTableByteIndexShift
PREPARE_EXTERNAL_VAR g_sw_ww_table, r10
add rax, qword ptr [r10]
cmp byte ptr [rax], 0x0
- jne CheckCardTable_ByRefWriteBarrier
+ jne LOCAL_LABEL(CheckCardTable_ByRefWriteBarrier)
mov byte ptr [rax], 0xFF
#endif
- CheckCardTable_ByRefWriteBarrier:
+ LOCAL_LABEL(CheckCardTable_ByRefWriteBarrier):
// See if we can just quick out
PREPARE_EXTERNAL_VAR g_ephemeral_low, rax
cmp rcx, [rax]
- jb Exit_ByRefWriteBarrier
+ jb LOCAL_LABEL(Exit_ByRefWriteBarrier)
PREPARE_EXTERNAL_VAR g_ephemeral_high, rax
cmp rcx, [rax]
- jnb Exit_ByRefWriteBarrier
+ jnb LOCAL_LABEL(Exit_ByRefWriteBarrier)
mov rax, rcx
PREPARE_EXTERNAL_VAR g_region_shr, rcx
mov cl, [rcx]
test cl, cl
- je SkipCheck_ByRefWriteBarrier
+ je LOCAL_LABEL(SkipCheck_ByRefWriteBarrier)
// check if the source is in gen 2 - then it's not an ephemeral pointer
shr rax, cl
PREPARE_EXTERNAL_VAR g_region_to_generation_table, r10
mov r10, [r10]
cmp byte ptr [rax + r10], 0x82
- je Exit_ByRefWriteBarrier
+ je LOCAL_LABEL(Exit_ByRefWriteBarrier)
// check if the destination happens to be in gen 0
mov rax, rdi
shr rax, cl
cmp byte ptr [rax + r10], 0
- je Exit_ByRefWriteBarrier
- SkipCheck_ByRefWriteBarrier:
+ je LOCAL_LABEL(Exit_ByRefWriteBarrier)
+ LOCAL_LABEL(SkipCheck_ByRefWriteBarrier):
PREPARE_EXTERNAL_VAR g_card_table, r10
mov r10, [r10]
PREPARE_EXTERNAL_VAR g_region_use_bitwise_write_barrier, rax
cmp byte ptr [rax], 0
- je CheckCardTableByte_ByRefWriteBarrier
+ je LOCAL_LABEL(CheckCardTableByte_ByRefWriteBarrier)
// compute card table bit
mov ecx, edi
@@ -400,15 +400,15 @@ LEAF_ENTRY JIT_ByRefWriteBarrier, _TEXT
shr rcx, 0xB
// Check if this card table bit is already set
test byte ptr [rcx + r10], al
- je SetCardTableBit_ByRefWriteBarrier
+ je LOCAL_LABEL(SetCardTableBit_ByRefWriteBarrier)
REPRET
- SetCardTableBit_ByRefWriteBarrier:
+ LOCAL_LABEL(SetCardTableBit_ByRefWriteBarrier):
lock or byte ptr [rcx + r10], al
- jmp CheckCardBundle_ByRefWriteBarrier
+ jmp LOCAL_LABEL(CheckCardBundle_ByRefWriteBarrier)
- CheckCardTableByte_ByRefWriteBarrier:
+ LOCAL_LABEL(CheckCardTableByte_ByRefWriteBarrier):
// move current rdi value into rcx and then increment the pointers
mov rcx, rdi
add rsi, 0x8
@@ -416,12 +416,12 @@ LEAF_ENTRY JIT_ByRefWriteBarrier, _TEXT
shr rcx, 0xB
cmp byte ptr [rcx + r10], 0xFF
- jne SetCardTableByte_ByRefWriteBarrier
+ jne LOCAL_LABEL(SetCardTableByte_ByRefWriteBarrier)
REPRET
- SetCardTableByte_ByRefWriteBarrier:
+ LOCAL_LABEL(SetCardTableByte_ByRefWriteBarrier):
mov byte ptr [rcx + r10], 0xFF
- CheckCardBundle_ByRefWriteBarrier:
+ LOCAL_LABEL(CheckCardBundle_ByRefWriteBarrier):
#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
// Shift rcx by 0x0A more to get the card bundle byte (we shifted by 0x0B already)
@@ -433,17 +433,17 @@ LEAF_ENTRY JIT_ByRefWriteBarrier, _TEXT
// Check if this bundle byte is dirty
cmp byte ptr [rcx], 0xFF
- jne UpdateCardBundle_ByRefWriteBarrier
+ jne LOCAL_LABEL(UpdateCardBundle_ByRefWriteBarrier)
REPRET
- UpdateCardBundle_ByRefWriteBarrier:
+ LOCAL_LABEL(UpdateCardBundle_ByRefWriteBarrier):
mov byte ptr [rcx], 0xFF
#endif
ret
.balign 16
- NotInHeap_ByRefWriteBarrier:
+ LOCAL_LABEL(NotInHeap_ByRefWriteBarrier):
// If WRITE_BARRIER_CHECK then we won't have already done the mov and should do it here
// If !WRITE_BARRIER_CHECK we want _NotInHeap and _Leave to be the same and have both
// 16 byte aligned.
@@ -451,7 +451,7 @@ LEAF_ENTRY JIT_ByRefWriteBarrier, _TEXT
// rcx is [rsi]
mov [rdi], rcx
#endif
- Exit_ByRefWriteBarrier:
+ LOCAL_LABEL(Exit_ByRefWriteBarrier):
// Increment the pointers before leaving
add rdi, 0x8
add rsi, 0x8
diff --git a/src/coreclr/vm/appdomain.hpp b/src/coreclr/vm/appdomain.hpp
index 2103ba6c654593..7633fb9f2881bf 100644
--- a/src/coreclr/vm/appdomain.hpp
+++ b/src/coreclr/vm/appdomain.hpp
@@ -2451,12 +2451,24 @@ class SystemDomain : public BaseDomain
}
static FrozenObjectHeapManager* GetFrozenObjectHeapManager()
{
- WRAPPER_NO_CONTRACT;
- if (m_FrozenObjectHeapManager == NULL)
+ CONTRACTL
+ {
+ THROWS;
+ MODE_COOPERATIVE;
+ }
+ CONTRACTL_END;
+
+ if (VolatileLoad(&m_FrozenObjectHeapManager) == nullptr)
{
LazyInitFrozenObjectsHeap();
}
- return m_FrozenObjectHeapManager;
+ return VolatileLoad(&m_FrozenObjectHeapManager);
+ }
+ static FrozenObjectHeapManager* GetFrozenObjectHeapManagerNoThrow()
+ {
+ LIMITED_METHOD_CONTRACT;
+
+ return VolatileLoad(&m_FrozenObjectHeapManager);
}
#endif // DACCESS_COMPILE
diff --git a/src/coreclr/vm/arm/cgencpu.h b/src/coreclr/vm/arm/cgencpu.h
index d31700e3477a40..6538cea705a56a 100644
--- a/src/coreclr/vm/arm/cgencpu.h
+++ b/src/coreclr/vm/arm/cgencpu.h
@@ -996,7 +996,7 @@ inline BOOL ClrFlushInstructionCache(LPCVOID pCodeAddr, size_t sizeOfCode, bool
// Precode to shuffle this and retbuf for closed delegates over static methods with return buffer
struct ThisPtrRetBufPrecode {
- static const int Type = 0x46;
+ static const int Type = 0x01;
// mov r12, r0
// mov r0, r1
diff --git a/src/coreclr/vm/arm/stubs.cpp b/src/coreclr/vm/arm/stubs.cpp
index 634eea810a31df..36eaeb51cdc5de 100644
--- a/src/coreclr/vm/arm/stubs.cpp
+++ b/src/coreclr/vm/arm/stubs.cpp
@@ -671,6 +671,16 @@ void HelperMethodFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
pRD->pCurrentContext->R10 = (DWORD)(pUnwoundState->captureR4_R11[6]);
pRD->pCurrentContext->R11 = (DWORD)(pUnwoundState->captureR4_R11[7]);
+ pRD->pCurrentContextPointers->R4 = &pRD->pCurrentContext->R4;
+ pRD->pCurrentContextPointers->R5 = &pRD->pCurrentContext->R5;
+ pRD->pCurrentContextPointers->R6 = &pRD->pCurrentContext->R6;
+ pRD->pCurrentContextPointers->R7 = &pRD->pCurrentContext->R7;
+ pRD->pCurrentContextPointers->R8 = &pRD->pCurrentContext->R8;
+ pRD->pCurrentContextPointers->R9 = &pRD->pCurrentContext->R9;
+ pRD->pCurrentContextPointers->R10 = &pRD->pCurrentContext->R10;
+ pRD->pCurrentContextPointers->R11 = &pRD->pCurrentContext->R11;
+ pRD->pCurrentContextPointers->Lr = &pRD->pCurrentContext->Lr;
+
return;
}
#endif // DACCESS_COMPILE
diff --git a/src/coreclr/vm/arm64/asmhelpers.S b/src/coreclr/vm/arm64/asmhelpers.S
index cdbe24ec427a98..89dab80461c356 100644
--- a/src/coreclr/vm/arm64/asmhelpers.S
+++ b/src/coreclr/vm/arm64/asmhelpers.S
@@ -329,7 +329,9 @@ WRITE_BARRIER_ENTRY JIT_CheckedWriteBarrier
// branch below is not taken.
ccmp x14, x12, #0x2, hs
- blo C_FUNC(JIT_WriteBarrier)
+ bhs LOCAL_LABEL(NotInHeap)
+
+ b C_FUNC(JIT_WriteBarrier)
LOCAL_LABEL(NotInHeap):
str x15, [x14], 8
diff --git a/src/coreclr/vm/arm64/stubs.cpp b/src/coreclr/vm/arm64/stubs.cpp
index bc3e2b9609caeb..4ae26363fd2d24 100644
--- a/src/coreclr/vm/arm64/stubs.cpp
+++ b/src/coreclr/vm/arm64/stubs.cpp
@@ -472,18 +472,18 @@ void HelperMethodFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
pRD->pCurrentContext->Fp = (DWORD64)(pUnwoundState->captureX19_X29[10]);
pRD->pCurrentContext->Lr = NULL; // Unwind again to get Caller's PC
- pRD->pCurrentContextPointers->X19 = pUnwoundState->ptrX19_X29[0];
- pRD->pCurrentContextPointers->X20 = pUnwoundState->ptrX19_X29[1];
- pRD->pCurrentContextPointers->X21 = pUnwoundState->ptrX19_X29[2];
- pRD->pCurrentContextPointers->X22 = pUnwoundState->ptrX19_X29[3];
- pRD->pCurrentContextPointers->X23 = pUnwoundState->ptrX19_X29[4];
- pRD->pCurrentContextPointers->X24 = pUnwoundState->ptrX19_X29[5];
- pRD->pCurrentContextPointers->X25 = pUnwoundState->ptrX19_X29[6];
- pRD->pCurrentContextPointers->X26 = pUnwoundState->ptrX19_X29[7];
- pRD->pCurrentContextPointers->X27 = pUnwoundState->ptrX19_X29[8];
- pRD->pCurrentContextPointers->X28 = pUnwoundState->ptrX19_X29[9];
- pRD->pCurrentContextPointers->Fp = pUnwoundState->ptrX19_X29[10];
- pRD->pCurrentContextPointers->Lr = NULL;
+ pRD->pCurrentContextPointers->X19 = &pRD->pCurrentContext->X19;
+ pRD->pCurrentContextPointers->X20 = &pRD->pCurrentContext->X20;
+ pRD->pCurrentContextPointers->X21 = &pRD->pCurrentContext->X21;
+ pRD->pCurrentContextPointers->X22 = &pRD->pCurrentContext->X22;
+ pRD->pCurrentContextPointers->X23 = &pRD->pCurrentContext->X23;
+ pRD->pCurrentContextPointers->X24 = &pRD->pCurrentContext->X24;
+ pRD->pCurrentContextPointers->X25 = &pRD->pCurrentContext->X25;
+ pRD->pCurrentContextPointers->X26 = &pRD->pCurrentContext->X26;
+ pRD->pCurrentContextPointers->X27 = &pRD->pCurrentContext->X27;
+ pRD->pCurrentContextPointers->X28 = &pRD->pCurrentContext->X28;
+ pRD->pCurrentContextPointers->Fp = &pRD->pCurrentContext->Fp;
+ pRD->pCurrentContextPointers->Lr = &pRD->pCurrentContext->Lr;
return;
}
diff --git a/src/coreclr/vm/callsiteinspect.cpp b/src/coreclr/vm/callsiteinspect.cpp
index dabbe89a497720..8209e41e6a7d44 100644
--- a/src/coreclr/vm/callsiteinspect.cpp
+++ b/src/coreclr/vm/callsiteinspect.cpp
@@ -433,7 +433,8 @@ void CallsiteInspect::PropagateOutParametersBackToCallsite(
*(ARG_SLOT *)(frame->GetReturnValuePtr()) = retVal;
}
#ifdef ENREGISTERED_RETURNTYPE_MAXSIZE
- else if (argit.HasNonStandardByvalReturn())
+ else if (argit.HasNonStandardByvalReturn()
+ && !(flags & CallsiteDetails::HResultReturn))
{
// In these cases, put the pointer to the return buffer into
// the frame's return value slot.
diff --git a/src/coreclr/vm/callsiteinspect.h b/src/coreclr/vm/callsiteinspect.h
index 373b9347dfd9c9..4ca66eca9feba2 100644
--- a/src/coreclr/vm/callsiteinspect.h
+++ b/src/coreclr/vm/callsiteinspect.h
@@ -25,6 +25,7 @@ struct CallsiteDetails
BeginInvoke = 0x01,
EndInvoke = 0x02,
Ctor = 0x04,
+ HResultReturn = 0x08,
};
INT32 Flags;
};
diff --git a/src/coreclr/vm/clrtocomcall.cpp b/src/coreclr/vm/clrtocomcall.cpp
index 06d28f507249b4..c604a6c8a90116 100644
--- a/src/coreclr/vm/clrtocomcall.cpp
+++ b/src/coreclr/vm/clrtocomcall.cpp
@@ -364,7 +364,7 @@ UINT32 CLRToCOMEventCallWorker(ComPlusMethodFrame* pFrame, ComPlusCallMethodDesc
return 0;
}
-CallsiteDetails CreateCallsiteDetails(_In_ FramedMethodFrame *pFrame)
+static CallsiteDetails CreateCallsiteDetails(_In_ FramedMethodFrame *pFrame)
{
CONTRACTL
{
@@ -442,10 +442,20 @@ CallsiteDetails CreateCallsiteDetails(_In_ FramedMethodFrame *pFrame)
SigTypeContext::InitTypeContext(pMD, actualType, &typeContext);
}
+ // If the signature is marked preserve sig, then the return
+ // is required to be an HRESULT, per COM rules. We set a flag to
+ // indicate this state to avoid issues when a C# developer defines
+ // an HRESULT in C# as a ValueClass with a single int field. This
+ // is convenient but does violate the COM ABI. Setting the flag
+ // lets us permit this convention and allow either a 4 byte primitive
+ // or the commonly used C# type "struct HResult { int Value; }".
+ if (IsMiPreserveSig(pMD->GetImplAttrs()))
+ callsiteFlags |= CallsiteDetails::HResultReturn;
+
_ASSERTE(!signature.IsEmpty() && pModule != nullptr);
// Create details
- return CallsiteDetails{ { signature, pModule, &typeContext }, pFrame, pMD, fIsDelegate };
+ return CallsiteDetails{ { signature, pModule, &typeContext }, pFrame, pMD, fIsDelegate, callsiteFlags };
}
UINT32 CLRToCOMLateBoundWorker(
diff --git a/src/coreclr/vm/dwbucketmanager.hpp b/src/coreclr/vm/dwbucketmanager.hpp
index 167685f78a597c..82532aa5b42b4b 100644
--- a/src/coreclr/vm/dwbucketmanager.hpp
+++ b/src/coreclr/vm/dwbucketmanager.hpp
@@ -960,11 +960,9 @@ bool BaseBucketParamsManager::GetFileVersionInfoForModule(Module* pModule, USHOR
// if we failed to get the version info from the native image then fall back to the IL image.
if (!succeeded)
{
- LPCWSTR modulePath = pPEAssembly->GetPath().GetUnicode();
- if (modulePath != NULL && modulePath != SString::Empty() && SUCCEEDED(DwGetFileVersionInfo(modulePath, major, minor, build, revision)))
- {
- succeeded = true;
- }
+ const SString& modulePath = pPEAssembly->GetPath();
+ _ASSERTE(modulePath.IsNormalized());
+ succeeded = !modulePath.IsEmpty() && SUCCEEDED(DwGetFileVersionInfo(modulePath.GetUnicode(), major, minor, build, revision));
}
}
diff --git a/src/coreclr/vm/eeconfig.cpp b/src/coreclr/vm/eeconfig.cpp
index 417910eb183bc0..0f1de4d4fe788a 100644
--- a/src/coreclr/vm/eeconfig.cpp
+++ b/src/coreclr/vm/eeconfig.cpp
@@ -721,7 +721,8 @@ HRESULT EEConfig::sync()
fTieredCompilation_CallCounting = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_TC_CallCounting) != 0;
DWORD tieredCompilation_ConfiguredCallCountThreshold =
- CLRConfig::GetConfigValue(CLRConfig::INTERNAL_TC_CallCountThreshold);
+ Configuration::GetKnobDWORDValue(W("System.Runtime.TieredCompilation.CallCountThreshold"), CLRConfig::EXTERNAL_TC_CallCountThreshold);
+
if (tieredCompilation_ConfiguredCallCountThreshold == 0)
{
tieredCompilation_CallCountThreshold = 1;
@@ -735,8 +736,9 @@ HRESULT EEConfig::sync()
tieredCompilation_CallCountThreshold = (UINT16)tieredCompilation_ConfiguredCallCountThreshold;
}
- tieredCompilation_CallCountingDelayMs = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_TC_CallCountingDelayMs);
-
+ tieredCompilation_CallCountingDelayMs =
+ Configuration::GetKnobDWORDValue(W("System.Runtime.TieredCompilation.CallCountingDelayMs"), CLRConfig::EXTERNAL_TC_CallCountingDelayMs);
+
bool hasSingleProcessor = GetCurrentProcessCpuCount() == 1;
if (hasSingleProcessor)
{
diff --git a/src/coreclr/vm/eventtrace.cpp b/src/coreclr/vm/eventtrace.cpp
index b9a82cfb7c28e9..9498f00edf4329 100644
--- a/src/coreclr/vm/eventtrace.cpp
+++ b/src/coreclr/vm/eventtrace.cpp
@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
-VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
+VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
CONTRACTL {
NOTHROW;
@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
CLR_JIT_KEYWORD))
{
pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
- ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
+ ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
}
} EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
-VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
+VOID ETW::MethodLog::SendMethodJitStartEvent(
+ MethodDesc *pMethodDesc,
+ COR_ILMETHOD_DECODER* methodDecoder,
+ SString *namespaceOrClassName,
+ SString *methodName,
+ SString *methodSignature)
{
CONTRACTL {
THROWS;
@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
ulMethodToken = (ULONG)0;
}
else
- ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
-
- if(pMethodDesc->IsIL())
{
- COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
- COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
- ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
+ ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
}
+ if (methodDecoder != NULL)
+ ulMethodILSize = methodDecoder->GetCodeSize();
+
SString tNamespace, tMethodName, tMethodSignature;
if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
{
diff --git a/src/coreclr/vm/excep.cpp b/src/coreclr/vm/excep.cpp
index 5be645ad496d7d..ce8b325a5f41b8 100644
--- a/src/coreclr/vm/excep.cpp
+++ b/src/coreclr/vm/excep.cpp
@@ -11616,7 +11616,8 @@ VOID GetAssemblyDetailInfo(SString &sType,
SString sAlcName;
pPEAssembly->GetAssemblyBinder()->GetNameForDiagnostics(sAlcName);
- if (pPEAssembly->GetPath().IsEmpty())
+ SString assemblyPath{ pPEAssembly->GetPath() };
+ if (assemblyPath.IsEmpty())
{
detailsUtf8.Printf("Type %s originates from '%s' in the context '%s' in a byte array",
sType.GetUTF8(),
@@ -11629,7 +11630,7 @@ VOID GetAssemblyDetailInfo(SString &sType,
sType.GetUTF8(),
sAssemblyDisplayName.GetUTF8(),
sAlcName.GetUTF8(),
- pPEAssembly->GetPath().GetUTF8());
+ assemblyPath.GetUTF8());
}
sAssemblyDetailInfo.Append(detailsUtf8.GetUnicode());
diff --git a/src/coreclr/vm/frozenobjectheap.cpp b/src/coreclr/vm/frozenobjectheap.cpp
index 45492155d2089c..8f11f3c8c74d64 100644
--- a/src/coreclr/vm/frozenobjectheap.cpp
+++ b/src/coreclr/vm/frozenobjectheap.cpp
@@ -10,7 +10,8 @@
#define FOH_COMMIT_SIZE (64 * 1024)
FrozenObjectHeapManager::FrozenObjectHeapManager():
- m_Crst(CrstFrozenObjectHeap, CRST_UNSAFE_COOPGC),
+ m_Crst(CrstFrozenObjectHeap, CRST_UNSAFE_ANYMODE),
+ m_SegmentRegistrationCrst(CrstFrozenObjectHeap),
m_CurrentSegment(nullptr)
{
}
@@ -18,7 +19,9 @@ FrozenObjectHeapManager::FrozenObjectHeapManager():
// Allocates an object of the give size (including header) on a frozen segment.
// May return nullptr if object is too large (larger than FOH_COMMIT_SIZE)
// in such cases caller is responsible to find a more appropriate heap to allocate it
-Object* FrozenObjectHeapManager::TryAllocateObject(PTR_MethodTable type, size_t objectSize, bool publish)
+
+Object* FrozenObjectHeapManager::TryAllocateObject(PTR_MethodTable type, size_t objectSize,
+ void(*initFunc)(Object*, void*), void* pParam)
{
CONTRACTL
{
@@ -33,64 +36,83 @@ Object* FrozenObjectHeapManager::TryAllocateObject(PTR_MethodTable type, size_t
#else // FEATURE_BASICFREEZE
Object* obj = nullptr;
- {
- CrstHolder ch(&m_Crst);
-
- _ASSERT(type != nullptr);
- _ASSERT(FOH_COMMIT_SIZE >= MIN_OBJECT_SIZE);
-
- // Currently we don't support frozen objects with special alignment requirements
- // TODO: We should also give up on arrays of doubles on 32-bit platforms.
- // (we currently never allocate them on frozen segments)
- #ifdef FEATURE_64BIT_ALIGNMENT
- if (type->RequiresAlign8())
- {
- // Align8 objects are not supported yet
- return nullptr;
- }
- #endif
+ FrozenObjectSegment* curSeg = nullptr;
+ uint8_t* curSegmentCurrent = nullptr;
+ size_t curSegSizeCommitted = 0;
- // NOTE: objectSize is expected be the full size including header
- _ASSERT(objectSize >= MIN_OBJECT_SIZE);
-
- if (objectSize > FOH_COMMIT_SIZE)
+ {
+ GCX_PREEMP();
{
- // The current design doesn't allow objects larger than FOH_COMMIT_SIZE and
- // since FrozenObjectHeap is just an optimization, let's not fill it with huge objects.
- return nullptr;
- }
-
- if (m_CurrentSegment == nullptr)
+ CrstHolder ch(&m_Crst);
+
+ _ASSERT(type != nullptr);
+ _ASSERT(FOH_COMMIT_SIZE >= MIN_OBJECT_SIZE);
+
+ // Currently we don't support frozen objects with special alignment requirements
+ // TODO: We should also give up on arrays of doubles on 32-bit platforms.
+ // (we currently never allocate them on frozen segments)
+#ifdef FEATURE_64BIT_ALIGNMENT
+ if (type->RequiresAlign8())
+ {
+ // Align8 objects are not supported yet
+ return nullptr;
+ }
+#endif
+
+ // NOTE: objectSize is expected be the full size including header
+ _ASSERT(objectSize >= MIN_OBJECT_SIZE);
+
+ if (objectSize > FOH_COMMIT_SIZE)
+ {
+ // The current design doesn't allow objects larger than FOH_COMMIT_SIZE and
+ // since FrozenObjectHeap is just an optimization, let's not fill it with huge objects.
+ return nullptr;
+ }
+
+ obj = m_CurrentSegment == nullptr ? nullptr : m_CurrentSegment->TryAllocateObject(type, objectSize);
+ // obj is nullptr if the current segment is full or hasn't been allocated yet
+ if (obj == nullptr)
+ {
+ size_t newSegmentSize = FOH_SEGMENT_DEFAULT_SIZE;
+ if (m_CurrentSegment != nullptr)
+ {
+ // Double the reserved size to reduce the number of frozen segments in apps with lots of frozen objects
+ // Use the same size in case if prevSegmentSize*2 operation overflows.
+ const size_t prevSegmentSize = m_CurrentSegment->m_Size;
+ newSegmentSize = max(prevSegmentSize, prevSegmentSize * 2);
+ }
+
+ m_CurrentSegment = new FrozenObjectSegment(newSegmentSize);
+ m_FrozenSegments.Append(m_CurrentSegment);
+
+ // Try again
+ obj = m_CurrentSegment->TryAllocateObject(type, objectSize);
+
+ // This time it's not expected to be null
+ _ASSERT(obj != nullptr);
+ }
+
+ if (initFunc != nullptr)
+ {
+ initFunc(obj, pParam);
+ }
+
+ curSeg = m_CurrentSegment;
+ curSegSizeCommitted = curSeg->m_SizeCommitted;
+ curSegmentCurrent = curSeg->m_pCurrent;
+ } // end of m_Crst lock
+
+ // Let GC know about the new segment or changes in it.
+ // We do it under a new lock because the main one (m_Crst) can be used by Profiler in a GC's thread
+ // and that might cause deadlocks since RegisterFrozenSegment may stuck on GC's lock.
{
- // Create the first segment on first allocation
- m_CurrentSegment = new FrozenObjectSegment(FOH_SEGMENT_DEFAULT_SIZE);
- m_FrozenSegments.Append(m_CurrentSegment);
- _ASSERT(m_CurrentSegment != nullptr);
+ CrstHolder regLock(&m_SegmentRegistrationCrst);
+ curSeg->RegisterOrUpdate(curSegmentCurrent, curSegSizeCommitted);
}
- obj = m_CurrentSegment->TryAllocateObject(type, objectSize);
-
- // The only case where it can be null is when the current segment is full and we need
- // to create a new one
- if (obj == nullptr)
- {
- // Double the reserved size to reduce the number of frozen segments in apps with lots of frozen objects
- // Use the same size in case if prevSegmentSize*2 operation overflows.
- size_t prevSegmentSize = m_CurrentSegment->GetSize();
- m_CurrentSegment = new FrozenObjectSegment(max(prevSegmentSize, prevSegmentSize * 2));
- m_FrozenSegments.Append(m_CurrentSegment);
-
- // Try again
- obj = m_CurrentSegment->TryAllocateObject(type, objectSize);
+ } // end of GCX_PREEMP
- // This time it's not expected to be null
- _ASSERT(obj != nullptr);
- }
- }
- if (publish)
- {
- PublishFrozenObject(obj);
- }
+ PublishFrozenObject(obj);
return obj;
#endif // !FEATURE_BASICFREEZE
@@ -101,10 +123,10 @@ Object* FrozenObjectHeapManager::TryAllocateObject(PTR_MethodTable type, size_t
FrozenObjectSegment::FrozenObjectSegment(size_t sizeHint) :
m_pStart(nullptr),
m_pCurrent(nullptr),
+ m_pCurrentRegistered(nullptr),
m_SizeCommitted(0),
m_Size(sizeHint),
m_SegmentHandle(nullptr)
- COMMA_INDEBUG(m_ObjectsCount(0))
{
_ASSERT(m_Size > FOH_COMMIT_SIZE);
_ASSERT(m_Size % FOH_COMMIT_SIZE == 0);
@@ -135,34 +157,61 @@ FrozenObjectSegment::FrozenObjectSegment(size_t sizeHint) :
ThrowOutOfMemory();
}
+ m_pStart = static_cast(committedAlloc);
+ m_pCurrent = m_pStart + sizeof(ObjHeader);
+ m_SizeCommitted = FOH_COMMIT_SIZE;
+
// ClrVirtualAlloc is expected to be PageSize-aligned so we can expect
// DATA_ALIGNMENT alignment as well
_ASSERT(IS_ALIGNED(committedAlloc, DATA_ALIGNMENT));
+}
- segment_info si;
- si.pvMem = committedAlloc;
- si.ibFirstObject = sizeof(ObjHeader);
- si.ibAllocated = si.ibFirstObject;
- si.ibCommit = FOH_COMMIT_SIZE;
- si.ibReserved = m_Size;
-
- m_SegmentHandle = GCHeapUtilities::GetGCHeap()->RegisterFrozenSegment(&si);
- if (m_SegmentHandle == nullptr)
+void FrozenObjectSegment::RegisterOrUpdate(uint8_t* current, size_t sizeCommited)
+{
+ CONTRACTL
{
- ClrVirtualFree(alloc, 0, MEM_RELEASE);
- ThrowOutOfMemory();
+ THROWS;
+ MODE_PREEMPTIVE;
}
+ CONTRACTL_END
- m_pStart = static_cast(committedAlloc);
- m_pCurrent = m_pStart + sizeof(ObjHeader);
- m_SizeCommitted = si.ibCommit;
- INDEBUG(m_ObjectsCount = 0);
- return;
+ if (m_pCurrentRegistered == nullptr)
+ {
+ segment_info si;
+ si.pvMem = m_pStart;
+ si.ibFirstObject = sizeof(ObjHeader);
+ si.ibAllocated = (size_t)current - (size_t)si.pvMem;
+ si.ibCommit = sizeCommited;
+ si.ibReserved = m_Size;
+
+ assert((size_t)current >= (size_t)si.pvMem);
+
+ // NOTE: RegisterFrozenSegment may take a GC lock inside.
+ m_SegmentHandle = GCHeapUtilities::GetGCHeap()->RegisterFrozenSegment(&si);
+ if (m_SegmentHandle == nullptr)
+ {
+ ThrowOutOfMemory();
+ }
+ m_pCurrentRegistered = current;
+ }
+ else
+ {
+ if (current > m_pCurrentRegistered)
+ {
+ GCHeapUtilities::GetGCHeap()->UpdateFrozenSegment(
+ m_SegmentHandle, current, m_pStart + sizeCommited);
+ m_pCurrentRegistered = current;
+ }
+ else
+ {
+ // Some other thread already advanced it.
+ }
+ }
}
Object* FrozenObjectSegment::TryAllocateObject(PTR_MethodTable type, size_t objectSize)
{
- _ASSERT(m_pStart != nullptr && m_Size > 0 && m_SegmentHandle != nullptr); // Expected to be inited
+ _ASSERT((m_pStart != nullptr) && (m_Size > 0));
_ASSERT(IS_ALIGNED(m_pCurrent, DATA_ALIGNMENT));
_ASSERT(IS_ALIGNED(objectSize, DATA_ALIGNMENT));
_ASSERT(objectSize <= FOH_COMMIT_SIZE);
@@ -194,16 +243,11 @@ Object* FrozenObjectSegment::TryAllocateObject(PTR_MethodTable type, size_t obje
m_SizeCommitted += FOH_COMMIT_SIZE;
}
- INDEBUG(m_ObjectsCount++);
-
Object* object = reinterpret_cast(m_pCurrent);
object->SetMethodTable(type);
m_pCurrent += objectSize;
- // Notify GC that we bumped the pointer and, probably, committed more memory in the reserved part
- GCHeapUtilities::GetGCHeap()->UpdateFrozenSegment(m_SegmentHandle, m_pCurrent, m_pStart + m_SizeCommitted);
-
return object;
}
diff --git a/src/coreclr/vm/frozenobjectheap.h b/src/coreclr/vm/frozenobjectheap.h
index d2c0bb62f134af..e191731d64dd5b 100644
--- a/src/coreclr/vm/frozenobjectheap.h
+++ b/src/coreclr/vm/frozenobjectheap.h
@@ -27,10 +27,12 @@ class FrozenObjectHeapManager
{
public:
FrozenObjectHeapManager();
- Object* TryAllocateObject(PTR_MethodTable type, size_t objectSize, bool publish = true);
+ Object* TryAllocateObject(PTR_MethodTable type, size_t objectSize,
+ void(*initFunc)(Object*,void*) = nullptr, void* pParam = nullptr);
private:
Crst m_Crst;
+ Crst m_SegmentRegistrationCrst;
SArray m_FrozenSegments;
FrozenObjectSegment* m_CurrentSegment;
@@ -43,10 +45,7 @@ class FrozenObjectSegment
public:
FrozenObjectSegment(size_t sizeHint);
Object* TryAllocateObject(PTR_MethodTable type, size_t objectSize);
- size_t GetSize() const
- {
- return m_Size;
- }
+ void RegisterOrUpdate(uint8_t* current, size_t sizeCommited);
private:
Object* GetFirstObject() const;
@@ -55,12 +54,20 @@ class FrozenObjectSegment
// Start of the reserved memory, the first object starts at "m_pStart + sizeof(ObjHeader)" (its pMT)
uint8_t* m_pStart;
+ // NOTE: To handle potential race conditions, only m_[x]Registered fields should be accessed
+ // externally as they guarantee that GC is aware of the current state of the segment.
+
// Pointer to the end of the current segment, ready to be used as a pMT for a new object
// meaning that "m_pCurrent - sizeof(ObjHeader)" is the actual start of the new object (header).
//
// m_pCurrent <= m_SizeCommitted
uint8_t* m_pCurrent;
+ // Last known value of m_pCurrent that GC is aware of.
+ //
+ // m_pCurrentRegistered <= m_pCurrent
+ uint8_t* m_pCurrentRegistered;
+
// Memory committed in the current segment
//
// m_SizeCommitted <= m_pStart + FOH_SIZE_RESERVED
@@ -70,10 +77,10 @@ class FrozenObjectSegment
size_t m_Size;
segment_handle m_SegmentHandle;
- INDEBUG(size_t m_ObjectsCount);
friend class ProfilerObjectEnum;
friend class ProfToEEInterfaceImpl;
+ friend class FrozenObjectHeapManager;
};
#endif // _FROZENOBJECTHEAP_H
diff --git a/src/coreclr/vm/gcenv.ee.cpp b/src/coreclr/vm/gcenv.ee.cpp
index dc28e791de0cf7..8d9f676d967a8e 100644
--- a/src/coreclr/vm/gcenv.ee.cpp
+++ b/src/coreclr/vm/gcenv.ee.cpp
@@ -115,16 +115,28 @@ static void ScanStackRoots(Thread * pThread, promote_func* fn, ScanContext* sc)
IsGCSpecialThread() ||
(GetThread() == ThreadSuspend::GetSuspensionThread() && ThreadStore::HoldingThreadStore()));
+#if defined(FEATURE_CONSERVATIVE_GC) || defined(USE_FEF)
Frame* pTopFrame = pThread->GetFrame();
Object ** topStack = (Object **)pTopFrame;
- if ((pTopFrame != ((Frame*)-1))
- && (pTopFrame->GetVTablePtr() == InlinedCallFrame::GetMethodFrameVPtr())) {
- // It is an InlinedCallFrame. Get SP from it.
+ if (InlinedCallFrame::FrameHasActiveCall(pTopFrame))
+ {
+ // It is an InlinedCallFrame with active call. Get SP from it.
InlinedCallFrame* pInlinedFrame = (InlinedCallFrame*)pTopFrame;
topStack = (Object **)pInlinedFrame->GetCallSiteSP();
}
+#endif // FEATURE_CONSERVATIVE_GC || USE_FEF
+#ifdef USE_FEF
+ // We only set the stack_limit when FEF (FaultingExceptionFrame) is enabled, because without the
+ // FEF, the code above would have to check if hardware exception is being handled and get the limit
+ // from the exception frame. Since the stack_limit is strictly necessary only on Unix and FEF is
+ // not enabled on Window x86 only, it is sufficient to keep the stack_limit set to 0 in this case.
+ // See the comment on the stack_limit usage in the PromoteCarefully function for more details.
sc->stack_limit = (uintptr_t)topStack;
+#else // USE_FEF
+ // It should be set to 0 in the ScanContext constructor
+ _ASSERTE(sc->stack_limit == 0);
+#endif // USE_FEF
#ifdef FEATURE_CONSERVATIVE_GC
if (g_pConfig->GetGCConservative())
diff --git a/src/coreclr/vm/gchelpers.cpp b/src/coreclr/vm/gchelpers.cpp
index e3c882f623b244..8e8a464c4f8852 100644
--- a/src/coreclr/vm/gchelpers.cpp
+++ b/src/coreclr/vm/gchelpers.cpp
@@ -555,18 +555,18 @@ OBJECTREF TryAllocateFrozenSzArray(MethodTable* pArrayMT, INT32 cElements)
#endif
FrozenObjectHeapManager* foh = SystemDomain::GetFrozenObjectHeapManager();
- ArrayBase* orArray = static_cast(foh->TryAllocateObject(pArrayMT, PtrAlign(totalSize), /*publish*/ false));
+ ArrayBase* orArray = static_cast(
+ foh->TryAllocateObject(pArrayMT, PtrAlign(totalSize), [](Object* obj, void* elemCntPtr){
+ // Initialize newly allocated object before publish
+ static_cast(obj)->m_NumComponents = *static_cast(elemCntPtr);
+ }, &cElements));
+
if (orArray == nullptr)
{
// We failed to allocate on a frozen segment, fallback to AllocateSzArray
// E.g. if the array is too big to fit on a frozen segment
return NULL;
}
- orArray->m_NumComponents = cElements;
-
- // Publish needs to be postponed in this case because we need to specify array length
- PublishObjectAndNotify(orArray, GC_ALLOC_NO_FLAGS);
-
return ObjectToOBJECTREF(orArray);
}
@@ -968,12 +968,15 @@ STRINGREF AllocateString(DWORD cchStringLength, bool preferFrozenHeap, bool* pIs
if (preferFrozenHeap)
{
FrozenObjectHeapManager* foh = SystemDomain::GetFrozenObjectHeapManager();
- orString = static_cast(foh->TryAllocateObject(g_pStringClass, totalSize, /* publish = */false));
+
+ orString = static_cast(foh->TryAllocateObject(
+ g_pStringClass, totalSize, [](Object* obj, void* pStrLen) {
+ // Initialize newly allocated object before publish
+ static_cast(obj)->SetStringLength(*static_cast(pStrLen));
+ }, &cchStringLength));
+
if (orString != nullptr)
{
- orString->SetStringLength(cchStringLength);
- // Publish needs to be postponed in this case because we need to specify string length
- PublishObjectAndNotify(orString, GC_ALLOC_NO_FLAGS);
_ASSERTE(orString->GetBuffer()[cchStringLength] == W('\0'));
orStringRef = ObjectToSTRINGREF(orString);
*pIsFrozen = true;
@@ -1139,7 +1142,7 @@ OBJECTREF TryAllocateFrozenObject(MethodTable* pObjMT)
#endif // FEATURE_64BIT_ALIGNMENT
FrozenObjectHeapManager* foh = SystemDomain::GetFrozenObjectHeapManager();
- Object* orObject = foh->TryAllocateObject(pObjMT, PtrAlign(pObjMT->GetBaseSize()), /*publish*/ true);
+ Object* orObject = foh->TryAllocateObject(pObjMT, PtrAlign(pObjMT->GetBaseSize()));
return ObjectToOBJECTREF(orObject);
}
diff --git a/src/coreclr/vm/interoplibinterface_comwrappers.cpp b/src/coreclr/vm/interoplibinterface_comwrappers.cpp
index 93fa6a448d4687..4b41b68b8e6151 100644
--- a/src/coreclr/vm/interoplibinterface_comwrappers.cpp
+++ b/src/coreclr/vm/interoplibinterface_comwrappers.cpp
@@ -5,6 +5,7 @@
// Runtime headers
#include "common.h"
+#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
@@ -257,32 +258,36 @@ namespace
using Element = SHash::element_t;
using Iterator = SHash::Iterator;
- class LockHolder : public CrstHolder
+ class ReaderLock final
{
+ SimpleReadLockHolder _lock;
public:
- LockHolder(_In_ ExtObjCxtCache *cache)
- : CrstHolder(&cache->_lock)
- {
- // This cache must be locked in Cooperative mode
- // since releases of wrappers can occur during a GC.
- CONTRACTL
- {
- NOTHROW;
- GC_NOTRIGGER;
- MODE_COOPERATIVE;
- }
- CONTRACTL_END;
- }
+ ReaderLock(_In_ ExtObjCxtCache* cache)
+ : _lock{ &cache->_lock }
+ { }
+
+ ~ReaderLock() = default;
+ };
+
+ class WriterLock final
+ {
+ SimpleWriteLockHolder _lock;
+ public:
+ WriterLock(_In_ ExtObjCxtCache* cache)
+ : _lock{ &cache->_lock }
+ { }
+
+ ~WriterLock() = default;
};
private:
friend struct InteropLibImports::RuntimeCallContext;
SHash _hashMap;
- Crst _lock;
+ SimpleRWLock _lock;
ExtObjCxtRefCache* _refCache;
ExtObjCxtCache()
- : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
+ : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
, _refCache(GetAppDomain()->GetRCWRefCache())
{ }
~ExtObjCxtCache() = default;
@@ -292,7 +297,7 @@ namespace
bool IsLockHeld()
{
WRAPPER_NO_CONTRACT;
- return (_lock.OwnedByCurrentThread() != FALSE);
+ return (_lock.LockTaken() != FALSE);
}
#endif // _DEBUG
@@ -343,7 +348,7 @@ namespace
// Determine the count of objects to return.
SIZE_T objCountMax = 0;
{
- LockHolder lock(this);
+ ReaderLock lock(this);
Iterator end = _hashMap.End();
for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
{
@@ -365,7 +370,7 @@ namespace
SIZE_T objCount = 0;
if (0 < objCountMax)
{
- LockHolder lock(this);
+ ReaderLock lock(this);
Iterator end = _hashMap.End();
for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
{
@@ -823,11 +828,22 @@ namespace
if (!uniqueInstance)
{
bool objectFound = false;
+ bool tryRemove = false;
{
- // Query the external object cache
- ExtObjCxtCache::LockHolder lock(cache);
+ // Perform a quick look up to determine if we know of the object and if
+ // we need to perform a more expensive cleanup operation below.
+ ExtObjCxtCache::ReaderLock lock(cache);
extObjCxt = cache->Find(cacheKey);
+ objectFound = extObjCxt != NULL;
+ tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
+ }
+ if (tryRemove)
+ {
+ // Perform the slower cleanup operation that may be appropriate
+ // if the object still exists and has been detached.
+ ExtObjCxtCache::WriterLock lock(cache);
+ extObjCxt = cache->Find(cacheKey);
objectFound = extObjCxt != NULL;
if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
{
@@ -958,7 +974,7 @@ namespace
else
{
// Attempt to insert the new context into the cache.
- ExtObjCxtCache::LockHolder lock(cache);
+ ExtObjCxtCache::WriterLock lock(cache);
extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
}
@@ -980,7 +996,7 @@ namespace
{
// Failed to set the context; one must already exist.
// Remove from the cache above as well.
- ExtObjCxtCache::LockHolder lock(cache);
+ ExtObjCxtCache::WriterLock lock(cache);
cache->Remove(resultHolder.GetContext());
COMPlusThrow(kNotSupportedException);
diff --git a/src/coreclr/vm/invokeutil.cpp b/src/coreclr/vm/invokeutil.cpp
index c4ba804a4c493f..e6ed2103393e37 100644
--- a/src/coreclr/vm/invokeutil.cpp
+++ b/src/coreclr/vm/invokeutil.cpp
@@ -906,9 +906,13 @@ void InvokeUtil::SetValidField(CorElementType fldType,
{
void* pFieldData;
if (pField->IsStatic())
+ {
pFieldData = pField->GetCurrentStaticAddress();
+ }
else
- pFieldData = (*((BYTE**)target)) + pField->GetOffset() + sizeof(Object);
+ {
+ pFieldData = pField->GetInstanceAddress(*target);
+ }
if (*valueObj == NULL)
InitValueClass(pFieldData, pMT);
@@ -1049,9 +1053,12 @@ OBJECTREF InvokeUtil::GetFieldValue(FieldDesc* pField, TypeHandle fieldType, OBJ
GCPROTECT_BEGIN(obj);
// calculate the offset to the field...
if (pField->IsStatic())
+ {
p = pField->GetCurrentStaticAddress();
- else {
- p = (*((BYTE**)target)) + pField->GetOffset() + sizeof(Object);
+ }
+ else
+ {
+ p = pField->GetInstanceAddress(*target);
}
GCPROTECT_END();
diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp
index 1a3439bdd235ef..74ee2f7482e747 100644
--- a/src/coreclr/vm/jitinterface.cpp
+++ b/src/coreclr/vm/jitinterface.cpp
@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,
SString namespaceOrClassName, methodName, methodSignature;
// Fire an ETW event to mark the beginning of JIT'ing
- ETW::MethodLog::MethodJitting(reinterpret_cast(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
+ ETW::MethodLog::MethodJitting(reinterpret_cast(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);
CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);
diff --git a/src/coreclr/vm/method.hpp b/src/coreclr/vm/method.hpp
index aaecfb20779f34..12b3c86e0f7414 100644
--- a/src/coreclr/vm/method.hpp
+++ b/src/coreclr/vm/method.hpp
@@ -1819,7 +1819,7 @@ class MethodDesc
PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
PCODE JitCompileCode(PrepareCodeConfig* pConfig);
PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
- PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
+ PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
public:
bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
diff --git a/src/coreclr/vm/methodtable.cpp b/src/coreclr/vm/methodtable.cpp
index 1016a80971b7a0..688bf29079e08d 100644
--- a/src/coreclr/vm/methodtable.cpp
+++ b/src/coreclr/vm/methodtable.cpp
@@ -4187,8 +4187,9 @@ void MethodTable::AllocateRegularStaticBox(FieldDesc* pField, Object** boxedStat
THROWS;
GC_TRIGGERS;
MODE_COOPERATIVE;
- CONTRACTL_END;
}
+ CONTRACTL_END
+
_ASSERT(pField->IsStatic() && !pField->IsSpecialStatic() && pField->IsByValue());
// Static fields are not pinned in collectible types so we need to protect the address
@@ -4222,8 +4223,8 @@ OBJECTREF MethodTable::AllocateStaticBox(MethodTable* pFieldMT, BOOL fPinned, OB
THROWS;
GC_TRIGGERS;
MODE_COOPERATIVE;
- CONTRACTL_END;
}
+ CONTRACTL_END
_ASSERTE(pFieldMT->IsValueType());
diff --git a/src/coreclr/vm/peimage.cpp b/src/coreclr/vm/peimage.cpp
index 55fc458c83762c..656b42b8111c70 100644
--- a/src/coreclr/vm/peimage.cpp
+++ b/src/coreclr/vm/peimage.cpp
@@ -141,11 +141,11 @@ ULONG PEImage::Release()
result=InterlockedDecrement(&m_refCount);
if (result == 0 )
{
- LOG((LF_LOADER, LL_INFO100, "PEImage: Closing Image %s\n", m_path.GetUTF8()));
+ LOG((LF_LOADER, LL_INFO100, "PEImage: Closing %p\n", this));
if(m_bInHashMap)
{
PEImageLocator locator(this);
- PEImage* deleted = (PEImage *)s_Images->DeleteValue(GetPathHash(), &locator);
+ PEImage* deleted = (PEImage *)s_Images->DeleteValue(m_pathHash, &locator);
_ASSERTE(deleted == this);
}
}
@@ -249,12 +249,7 @@ BOOL PEImage::CompareImage(UPTR u1, UPTR u2)
EX_TRY
{
SString path(SString::Literal, pLocator->m_pPath);
-
-#ifdef FEATURE_CASE_SENSITIVE_FILESYSTEM
- if (pImage->GetPath().Equals(path))
-#else
if (pImage->GetPath().EqualsCaseInsensitive(path))
-#endif
{
ret = TRUE;
}
@@ -623,6 +618,7 @@ void PEImage::EnumMemoryRegions(CLRDataEnumMemoryFlags flags)
PEImage::PEImage():
m_path(),
+ m_pathHash(0),
m_refCount(1),
m_bInHashMap(FALSE),
m_bundleFileLocation(),
diff --git a/src/coreclr/vm/peimage.h b/src/coreclr/vm/peimage.h
index d30e561890c79e..e7bfc11d319f12 100644
--- a/src/coreclr/vm/peimage.h
+++ b/src/coreclr/vm/peimage.h
@@ -132,8 +132,6 @@ class PEImage final
PTR_PEImageLayout GetLoadedLayout();
PTR_PEImageLayout GetFlatLayout();
- BOOL HasPath();
- ULONG GetPathHash();
const SString& GetPath();
const SString& GetPathToLoad();
LPCWSTR GetPathForErrorMessages() { return GetPath(); }
@@ -288,6 +286,7 @@ class PEImage final
// ------------------------------------------------------------
SString m_path;
+ ULONG m_pathHash;
LONG m_refCount;
// means this is a unique (deduped) instance.
diff --git a/src/coreclr/vm/peimage.inl b/src/coreclr/vm/peimage.inl
index 6bb3c9320cb5f0..d17d5d9dd77387 100644
--- a/src/coreclr/vm/peimage.inl
+++ b/src/coreclr/vm/peimage.inl
@@ -288,6 +288,7 @@ inline void PEImage::Init(LPCWSTR pPath, BundleFileLocation bundleFileLocation)
m_path = pPath;
m_path.Normalize();
+ m_pathHash = m_path.HashCaseInsensitive();
m_bundleFileLocation = bundleFileLocation;
SetModuleFileNameHintForDAC();
}
@@ -310,11 +311,7 @@ inline PTR_PEImage PEImage::FindByPath(LPCWSTR pPath, BOOL isInBundle /* = TRUE
int CaseHashHelper(const WCHAR *buffer, COUNT_T count);
PEImageLocator locator(pPath, isInBundle);
-#ifdef FEATURE_CASE_SENSITIVE_FILESYSTEM
- DWORD dwHash=path.Hash();
-#else
DWORD dwHash = CaseHashHelper(pPath, (COUNT_T) u16_strlen(pPath));
-#endif
return (PEImage *) s_Images->LookupValue(dwHash, &locator);
}
@@ -366,7 +363,7 @@ inline void PEImage::AddToHashMap()
CONTRACTL_END;
_ASSERTE(s_hashLock.OwnedByCurrentThread());
- s_Images->InsertValue(GetPathHash(),this);
+ s_Images->InsertValue(m_pathHash,this);
m_bInHashMap=TRUE;
}
@@ -378,31 +375,6 @@ inline BOOL PEImage::Has32BitNTHeaders()
return GetOrCreateLayout(PEImageLayout::LAYOUT_ANY)->Has32BitNTHeaders();
}
-inline BOOL PEImage::HasPath()
-{
- LIMITED_METHOD_CONTRACT;
-
- return !GetPath().IsEmpty();
-}
-
-inline ULONG PEImage::GetPathHash()
-{
- CONTRACT(ULONG)
- {
- PRECONDITION(HasPath());
- MODE_ANY;
- GC_NOTRIGGER;
- THROWS;
- }
- CONTRACT_END;
-
-#ifdef FEATURE_CASE_SENSITIVE_FILESYSTEM
- RETURN m_path.Hash();
-#else
- RETURN m_path.HashCaseInsensitive();
-#endif
-}
-
inline void PEImage::GetPEKindAndMachine(DWORD* pdwKind, DWORD* pdwMachine)
{
CONTRACTL
diff --git a/src/coreclr/vm/peimagelayout.cpp b/src/coreclr/vm/peimagelayout.cpp
index c756c451649b34..0f0dde27618196 100644
--- a/src/coreclr/vm/peimagelayout.cpp
+++ b/src/coreclr/vm/peimagelayout.cpp
@@ -534,7 +534,10 @@ LoadedImageLayout::LoadedImageLayout(PEImage* pOwner, HRESULT* loadFailure)
IfFailThrow(Init(m_Module, true));
- LOG((LF_LOADER, LL_INFO1000, "PEImage: Opened HMODULE %s\n", pOwner->GetPath().GetUTF8()));
+#ifdef LOGGING
+ SString ownerPath{ pOwner->GetPath() };
+ LOG((LF_LOADER, LL_INFO1000, "PEImage: Opened HMODULE %s\n", ownerPath.GetUTF8()));
+#endif // LOGGING
#else
HANDLE hFile = pOwner->GetFileHandle();
@@ -548,8 +551,11 @@ LoadedImageLayout::LoadedImageLayout(PEImage* pOwner, HRESULT* loadFailure)
return;
}
+#ifdef LOGGING
+ SString ownerPath{ pOwner->GetPath() };
LOG((LF_LOADER, LL_INFO1000, "PEImage: image %s (hFile %p) mapped @ %p\n",
- pOwner->GetPath().GetUTF8(), hFile, (void*)m_LoadedFile));
+ ownerPath.GetUTF8(), hFile, (void*)m_LoadedFile));
+#endif // LOGGING
IfFailThrow(Init((void*)m_LoadedFile));
@@ -616,7 +622,10 @@ FlatImageLayout::FlatImageLayout(PEImage* pOwner)
INT64 offset = pOwner->GetOffset();
INT64 size = pOwner->GetSize();
- LOG((LF_LOADER, LL_INFO100, "PEImage: Opening flat %s\n", pOwner->GetPath().GetUTF8()));
+#ifdef LOGGING
+ SString ownerPath{ pOwner->GetPath() };
+ LOG((LF_LOADER, LL_INFO100, "PEImage: Opening flat %s\n", ownerPath.GetUTF8()));
+#endif // LOGGING
// If a size is not specified, load the whole file
if (size == 0)
diff --git a/src/coreclr/vm/precode.h b/src/coreclr/vm/precode.h
index d7f6b4cac1a74d..3f6a2f532c4e67 100644
--- a/src/coreclr/vm/precode.h
+++ b/src/coreclr/vm/precode.h
@@ -11,7 +11,7 @@
#define PRECODE_ALIGNMENT sizeof(void*)
-#if defined(HOST_AMD64)
+#if defined(TARGET_AMD64)
#define OFFSETOF_PRECODE_TYPE 0
#define OFFSETOF_PRECODE_TYPE_CALL_OR_JMP 5
@@ -19,7 +19,7 @@
#define SIZEOF_PRECODE_BASE 16
-#elif defined(HOST_X86)
+#elif defined(TARGET_X86)
EXTERN_C VOID STDCALL PrecodeRemotingThunk();
@@ -29,27 +29,27 @@ EXTERN_C VOID STDCALL PrecodeRemotingThunk();
#define SIZEOF_PRECODE_BASE 8
-#elif defined(HOST_ARM64)
+#elif defined(TARGET_ARM64)
#define SIZEOF_PRECODE_BASE CODE_SIZE_ALIGN
#define OFFSETOF_PRECODE_TYPE 0
-#elif defined(HOST_ARM)
+#elif defined(TARGET_ARM)
-#define SIZEOF_PRECODE_BASE CODE_SIZE_ALIGN
-#define OFFSETOF_PRECODE_TYPE 3
+#define SIZEOF_PRECODE_BASE CODE_SIZE_ALIGN * 2
+#define OFFSETOF_PRECODE_TYPE 7
-#elif defined(HOST_LOONGARCH64)
+#elif defined(TARGET_LOONGARCH64)
#define SIZEOF_PRECODE_BASE CODE_SIZE_ALIGN
#define OFFSETOF_PRECODE_TYPE 0
-#elif defined(HOST_RISCV64)
+#elif defined(TARGET_RISCV64)
#define SIZEOF_PRECODE_BASE CODE_SIZE_ALIGN
#define OFFSETOF_PRECODE_TYPE 0
-#endif // HOST_AMD64
+#endif // TARGET_AMD64
#ifndef DACCESS_COMPILE
// Given an address in a slot, figure out if the prestub will be called
@@ -61,14 +61,14 @@ BOOL DoesSlotCallPrestub(PCODE pCode);
// Invalid precode type
struct InvalidPrecode
{
-#if defined(HOST_AMD64) || defined(HOST_X86)
+#if defined(TARGET_AMD64) || defined(TARGET_X86)
// int3
static const int Type = 0xCC;
-#elif defined(HOST_ARM64) || defined(HOST_ARM)
+#elif defined(TARGET_ARM64) || defined(TARGET_ARM)
static const int Type = 0;
-#elif defined(HOST_LOONGARCH64)
+#elif defined(TARGET_LOONGARCH64)
static const int Type = 0xff;
-#elif defined(HOST_RISCV64)
+#elif defined(TARGET_RISCV64)
static const int Type = 0xff;
#endif
};
@@ -90,25 +90,25 @@ extern "C" void StubPrecodeCode_End();
// Regular precode
struct StubPrecode
{
-#if defined(HOST_AMD64)
+#if defined(TARGET_AMD64)
static const BYTE Type = 0x4C;
static const SIZE_T CodeSize = 24;
-#elif defined(HOST_X86)
+#elif defined(TARGET_X86)
static const BYTE Type = 0xA1;
static const SIZE_T CodeSize = 24;
-#elif defined(HOST_ARM64)
+#elif defined(TARGET_ARM64)
static const int Type = 0x4A;
static const SIZE_T CodeSize = 24;
-#elif defined(HOST_ARM)
- static const int Type = 0xCF;
+#elif defined(TARGET_ARM)
+ static const int Type = 0xFF;
static const SIZE_T CodeSize = 12;
-#elif defined(HOST_LOONGARCH64)
+#elif defined(TARGET_LOONGARCH64)
static const int Type = 0x4;
static const SIZE_T CodeSize = 24;
-#elif defined(HOST_RISCV64)
+#elif defined(TARGET_RISCV64)
static const int Type = 0x17;
static const SIZE_T CodeSize = 24;
-#endif // HOST_AMD64
+#endif // TARGET_AMD64
BYTE m_code[CodeSize];
@@ -189,7 +189,7 @@ typedef DPTR(StubPrecode) PTR_StubPrecode;
// (This is fake precode. VTable slot does not point to it.)
struct NDirectImportPrecode : StubPrecode
{
- static const int Type = 0x01;
+ static const int Type = 0x05;
void Init(NDirectImportPrecode* pPrecodeRX, MethodDesc* pMD, LoaderAllocator *pLoaderAllocator);
@@ -224,31 +224,31 @@ extern "C" void FixupPrecodeCode_End();
// The fixup precode is simple jump once patched. It does not have the two instruction overhead of regular precode.
struct FixupPrecode
{
-#if defined(HOST_AMD64)
+#if defined(TARGET_AMD64)
static const int Type = 0xFF;
static const SIZE_T CodeSize = 24;
static const int FixupCodeOffset = 6;
-#elif defined(HOST_X86)
+#elif defined(TARGET_X86)
static const int Type = 0xFF;
static const SIZE_T CodeSize = 24;
static const int FixupCodeOffset = 6;
-#elif defined(HOST_ARM64)
+#elif defined(TARGET_ARM64)
static const int Type = 0x0B;
static const SIZE_T CodeSize = 24;
static const int FixupCodeOffset = 8;
-#elif defined(HOST_ARM)
- static const int Type = 0xFF;
+#elif defined(TARGET_ARM)
+ static const int Type = 0xCF;
static const SIZE_T CodeSize = 12;
static const int FixupCodeOffset = 4 + THUMB_CODE;
-#elif defined(HOST_LOONGARCH64)
+#elif defined(TARGET_LOONGARCH64)
static const int Type = 0x3;
static const SIZE_T CodeSize = 32;
static const int FixupCodeOffset = 12;
-#elif defined(HOST_RISCV64)
+#elif defined(TARGET_RISCV64)
static const int Type = 0x97;
static const SIZE_T CodeSize = 32;
static const int FixupCodeOffset = 10;
-#endif // HOST_AMD64
+#endif // TARGET_AMD64
BYTE m_code[CodeSize];
@@ -614,4 +614,8 @@ static_assert_no_msg(FixupPrecode::Type != NDirectImportPrecode::Type);
static_assert_no_msg(FixupPrecode::Type != ThisPtrRetBufPrecode::Type);
static_assert_no_msg(NDirectImportPrecode::Type != ThisPtrRetBufPrecode::Type);
+// Verify that the base type for each precode fits into each specific precode type
+static_assert_no_msg(sizeof(Precode) <= sizeof(NDirectImportPrecode));
+static_assert_no_msg(sizeof(Precode) <= sizeof(FixupPrecode));
+static_assert_no_msg(sizeof(Precode) <= sizeof(ThisPtrRetBufPrecode));
#endif // __PRECODE_H__
diff --git a/src/coreclr/vm/prestub.cpp b/src/coreclr/vm/prestub.cpp
index 174e48565f31b8..32944952301648 100644
--- a/src/coreclr/vm/prestub.cpp
+++ b/src/coreclr/vm/prestub.cpp
@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
}
}
+namespace
+{
+ COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
+ {
+ STANDARD_VM_CONTRACT;
+ _ASSERTE(pMD != NULL);
+ _ASSERTE(!pMD->IsNoMetadata());
+ _ASSERTE(pConfig != NULL);
+ _ASSERTE(pDecoderMemory != NULL);
+
+ COR_ILMETHOD_DECODER* pHeader = NULL;
+ COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
+ if (ilHeader == NULL)
+ return NULL;
+
+ COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
+ {
+ // Decoder ctor can AV on a malformed method header
+ AVInRuntimeImplOkayHolder AVOkay;
+ pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
+ }
+
+ if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
+ COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);
+
+ return pHeader;
+ }
+
+ COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
+ {
+ STANDARD_VM_CONTRACT;
+ _ASSERTE(pMD != NULL);
+ if (pMD->IsIL())
+ {
+ return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
+ }
+ else if (pMD->IsILStub())
+ {
+ ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
+ return pResolver->GetILHeader();
+ }
+
+ _ASSERTE(pMD->IsNoMetadata());
+ return NULL;
+ }
+}
+
PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
STANDARD_VM_CONTRACT;
@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
}
#endif // PROFILING_SUPPORTED
+ // The profiler may have changed the code on the callback. Need to
+ // pick up the new code.
+ //
+ // (don't want this for OSR, need to see how it works)
+ COR_ILMETHOD_DECODER ilDecoderTemp;
+ COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);
+
if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
TRACE_LEVEL_VERBOSE,
CLR_JIT_KEYWORD))
{
- pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
+ pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
}
else
{
@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
// a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
ETW::MethodLog::MethodJitting(this,
+ pilHeader,
&namespaceOrClassName,
&methodName,
&methodSignature);
#endif
- pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
+ pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
// Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
return pCode;
}
-namespace
-{
- COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
- {
- STANDARD_VM_CONTRACT;
- _ASSERTE(pMD != NULL);
- _ASSERTE(!pMD->IsNoMetadata());
- _ASSERTE(pConfig != NULL);
- _ASSERTE(pDecoderMemory != NULL);
-
- COR_ILMETHOD_DECODER* pHeader = NULL;
- COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
- if (ilHeader == NULL)
- return NULL;
-
- COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
- {
- // Decoder ctor can AV on a malformed method header
- AVInRuntimeImplOkayHolder AVOkay;
- pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
- }
-
- if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
- COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);
-
- return pHeader;
- }
-
- COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
- {
- STANDARD_VM_CONTRACT;
- _ASSERTE(pMD != NULL);
- if (pMD->IsIL())
- {
- return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
- }
- else if (pMD->IsILStub())
- {
- ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
- return pResolver->GetILHeader();
- }
-
- _ASSERTE(pMD->IsNoMetadata());
- return NULL;
- }
-}
-
-PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
+PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
STANDARD_VM_CONTRACT;
PCODE pCode = NULL;
-
- // The profiler may have changed the code on the callback. Need to
- // pick up the new code.
- //
- // (don't want this for OSR, need to see how it works)
- COR_ILMETHOD_DECODER ilDecoderTemp;
- COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);
-
CORJIT_FLAGS jitFlags;
PCODE pOtherCode = NULL;
diff --git a/src/coreclr/vm/profilingenumerators.cpp b/src/coreclr/vm/profilingenumerators.cpp
index 1d19a87324be92..c55d40ffbeed9e 100644
--- a/src/coreclr/vm/profilingenumerators.cpp
+++ b/src/coreclr/vm/profilingenumerators.cpp
@@ -103,7 +103,12 @@ BOOL ProfilerObjectEnum::Init()
}
CONTRACTL_END;
- FrozenObjectHeapManager* foh = SystemDomain::GetFrozenObjectHeapManager();
+ FrozenObjectHeapManager* foh = SystemDomain::GetFrozenObjectHeapManagerNoThrow();
+ if (foh == nullptr)
+ {
+ return TRUE;
+ }
+
CrstHolder ch(&foh->m_Crst);
const unsigned segmentsCount = foh->m_FrozenSegments.GetCount();
@@ -113,7 +118,6 @@ BOOL ProfilerObjectEnum::Init()
for (unsigned segmentIdx = 0; segmentIdx < segmentsCount; segmentIdx++)
{
const FrozenObjectSegment* segment = segments[segmentIdx];
-
Object* currentObj = segment->GetFirstObject();
while (currentObj != nullptr)
{
diff --git a/src/coreclr/vm/proftoeeinterfaceimpl.cpp b/src/coreclr/vm/proftoeeinterfaceimpl.cpp
index 1f2e4f26001859..11853acdcf86ee 100644
--- a/src/coreclr/vm/proftoeeinterfaceimpl.cpp
+++ b/src/coreclr/vm/proftoeeinterfaceimpl.cpp
@@ -7672,7 +7672,12 @@ HRESULT ProfToEEInterfaceImpl::GetNonGCHeapBounds(ULONG cObjectRanges,
return E_INVALIDARG;
}
- FrozenObjectHeapManager* foh = SystemDomain::GetFrozenObjectHeapManager();
+ FrozenObjectHeapManager* foh = SystemDomain::GetFrozenObjectHeapManagerNoThrow();
+ if (foh == nullptr)
+ {
+ *pcObjectRanges = 0;
+ return S_OK;
+ }
CrstHolder ch(&foh->m_Crst);
const unsigned segmentsCount = foh->m_FrozenSegments.GetCount();
diff --git a/src/coreclr/vm/readytoruninfo.cpp b/src/coreclr/vm/readytoruninfo.cpp
index 2c186cf7adeaff..e75373db8855aa 100644
--- a/src/coreclr/vm/readytoruninfo.cpp
+++ b/src/coreclr/vm/readytoruninfo.cpp
@@ -429,7 +429,8 @@ static void LogR2r(const char *msg, PEAssembly *pPEAssembly)
if (r2rLogFile == NULL)
return;
- fprintf(r2rLogFile, "%s: \"%s\".\n", msg, pPEAssembly->GetPath().GetUTF8());
+ SString assemblyPath{ pPEAssembly->GetPath() };
+ fprintf(r2rLogFile, "%s: \"%s\".\n", msg, assemblyPath.GetUTF8());
fflush(r2rLogFile);
}
@@ -1904,7 +1905,7 @@ uint32_t ReadyToRun_TypeGenericInfoMap::GetGenericArgumentCount(mdTypeDef input,
uint32_t count = ((uint8_t)typeGenericInfo & (uint8_t)ReadyToRunTypeGenericInfo::GenericCountMask);
if (count > 2)
foundResult = false;
-
+
if (!foundResult)
{
HENUMInternalHolder hEnumTyPars(pImport);
@@ -1922,7 +1923,7 @@ HRESULT ReadyToRun_TypeGenericInfoMap::GetGenericArgumentCountNoThrow(mdTypeDef
uint32_t count = ((uint8_t)typeGenericInfo & (uint8_t)ReadyToRunTypeGenericInfo::GenericCountMask);
if (count > 2)
foundResult = false;
-
+
if (!foundResult)
{
HENUMInternalHolder hEnumTyPars(pImport);
diff --git a/src/coreclr/vm/siginfo.cpp b/src/coreclr/vm/siginfo.cpp
index b9807b51ba4af8..eb35f3a372538f 100644
--- a/src/coreclr/vm/siginfo.cpp
+++ b/src/coreclr/vm/siginfo.cpp
@@ -4962,11 +4962,6 @@ void PromoteCarefully(promote_func fn,
#if !defined(DACCESS_COMPILE)
- //
- // Sanity check the stack scan limit
- //
- assert(sc->stack_limit != 0);
-
// Note that the base is at a higher address than the limit, since the stack
// grows downwards.
// To check whether the object is in the stack or not, we also need to check the sc->stack_limit.
diff --git a/src/coreclr/vm/typedesc.cpp b/src/coreclr/vm/typedesc.cpp
index 6c3226882503c6..95e86ccc961691 100644
--- a/src/coreclr/vm/typedesc.cpp
+++ b/src/coreclr/vm/typedesc.cpp
@@ -104,6 +104,31 @@ BOOL TypeDesc::IsSharedByGenericInstantiations()
return FALSE;
}
+BOOL TypeDesc::ContainsGenericVariables(BOOL methodOnly)
+{
+ if (IsGenericVariable())
+ {
+ if (!methodOnly)
+ return TRUE;
+
+ PTR_TypeVarTypeDesc pTyVar = dac_cast(this);
+ return TypeFromToken(pTyVar->GetTypeOrMethodDef()) == mdtMethodDef;
+ }
+
+ if (HasTypeParam())
+ {
+ return GetRootTypeParam().ContainsGenericVariables(methodOnly);
+ }
+
+ if (IsFnPtr())
+ {
+ return dac_cast(this)->ContainsGenericVariables(methodOnly);
+ }
+
+ return FALSE;
+}
+
+
PTR_BaseDomain TypeDesc::GetDomain()
{
CONTRACTL
@@ -1670,6 +1695,21 @@ FnPtrTypeDesc::IsSharedByGenericInstantiations()
return FALSE;
} // FnPtrTypeDesc::IsSharedByGenericInstantiations
+BOOL
+FnPtrTypeDesc::ContainsGenericVariables(BOOL methodOnly)
+{
+ LIMITED_METHOD_DAC_CONTRACT;
+
+ for (DWORD i = 0; i <= m_NumArgs; i++)
+ {
+ if (m_RetAndArgTypes[i].ContainsGenericVariables(methodOnly))
+ {
+ return TRUE;
+ }
+ }
+ return FALSE;
+} // FnPtrTypeDesc::ContainsGenericVariables
+
#ifndef DACCESS_COMPILE
// Returns TRUE if all return and argument types are externally visible.
diff --git a/src/coreclr/vm/typedesc.h b/src/coreclr/vm/typedesc.h
index 51614c3b110778..b86845c81e21c0 100644
--- a/src/coreclr/vm/typedesc.h
+++ b/src/coreclr/vm/typedesc.h
@@ -182,6 +182,8 @@ class TypeDesc
BOOL IsSharedByGenericInstantiations();
+ BOOL ContainsGenericVariables(BOOL methodOnly);
+
protected:
// See methodtable.h for details of the flags with the same name there
enum
@@ -527,6 +529,8 @@ class FnPtrTypeDesc : public TypeDesc
BOOL IsSharedByGenericInstantiations();
+ BOOL ContainsGenericVariables(BOOL methodOnly);
+
#ifndef DACCESS_COMPILE
// Returns TRUE if all return and argument types are externally visible.
BOOL IsExternallyVisible() const;
diff --git a/src/coreclr/vm/typehandle.cpp b/src/coreclr/vm/typehandle.cpp
index 59eed8b5030d86..053cc759217c76 100644
--- a/src/coreclr/vm/typehandle.cpp
+++ b/src/coreclr/vm/typehandle.cpp
@@ -138,26 +138,10 @@ BOOL TypeHandle::ContainsGenericVariables(BOOL methodOnly /*=FALSE*/) const
STATIC_CONTRACT_NOTHROW;
SUPPORTS_DAC;
- if (HasTypeParam())
- {
- return GetTypeParam().ContainsGenericVariables(methodOnly);
- }
-
- if (IsGenericVariable())
- {
- if (!methodOnly)
- return TRUE;
-
- PTR_TypeVarTypeDesc pTyVar = dac_cast(AsTypeDesc());
- return TypeFromToken(pTyVar->GetTypeOrMethodDef()) == mdtMethodDef;
- }
- else if (HasInstantiation())
- {
- if (GetMethodTable()->ContainsGenericVariables(methodOnly))
- return TRUE;
- }
-
- return FALSE;
+ if (IsTypeDesc())
+ return AsTypeDesc()->ContainsGenericVariables(methodOnly);
+ else
+ return AsMethodTable()->ContainsGenericVariables(methodOnly);
}
//@GENERICS:
diff --git a/src/coreclr/vm/versionresilienthashcode.cpp b/src/coreclr/vm/versionresilienthashcode.cpp
index b3ba764baac595..85bd146d8dc463 100644
--- a/src/coreclr/vm/versionresilienthashcode.cpp
+++ b/src/coreclr/vm/versionresilienthashcode.cpp
@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
hash->Add(varValue);
break;
}
-
+
case InlineVar: // 2 byte value which is token change resilient
{
uint16_t varValue;
@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*
initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
}
+ else if (!pMD->HasILHeader())
+ {
+ // Dynamically generated IL methods like UnsafeAccessors may not have
+ // an IL header.
+ return false;
+ }
else
{
COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
diff --git a/src/installer/managed/Microsoft.NET.HostModel/AppHost/PEUtils.cs b/src/installer/managed/Microsoft.NET.HostModel/AppHost/PEUtils.cs
index 0d0b33ed55569e..1bfc80fcfca492 100644
--- a/src/installer/managed/Microsoft.NET.HostModel/AppHost/PEUtils.cs
+++ b/src/installer/managed/Microsoft.NET.HostModel/AppHost/PEUtils.cs
@@ -1,8 +1,11 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System;
+using System.Buffers.Binary;
using System.IO;
using System.IO.MemoryMappedFiles;
+using System.Reflection.PortableExecutable;
namespace Microsoft.NET.HostModel.AppHost
{
@@ -15,29 +18,13 @@ public static class PEUtils
/// true if the accessor represents a PE image, false otherwise.
internal static unsafe bool IsPEImage(MemoryMappedViewAccessor accessor)
{
- byte* pointer = null;
+ if (accessor.Capacity < PEOffsets.DosStub.PESignatureOffset + sizeof(uint))
+ return false;
- try
- {
- accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref pointer);
- byte* bytes = pointer + accessor.PointerOffset;
-
- // https://en.wikipedia.org/wiki/Portable_Executable
- // Validate that we're looking at Windows PE file
- if (((ushort*)bytes)[0] != PEOffsets.DosImageSignature
- || accessor.Capacity < PEOffsets.DosStub.PESignatureOffset + sizeof(uint))
- {
- return false;
- }
- return true;
- }
- finally
- {
- if (pointer != null)
- {
- accessor.SafeMemoryMappedViewHandle.ReleasePointer();
- }
- }
+ // https://en.wikipedia.org/wiki/Portable_Executable
+ // Validate that we're looking at Windows PE file
+ ushort signature = AsLittleEndian(accessor.ReadUInt16(0));
+ return signature == PEOffsets.DosImageSignature;
}
public static bool IsPEImage(string filePath)
@@ -60,40 +47,15 @@ public static bool IsPEImage(string filePath)
/// The memory accessor which has the apphost file opened.
internal static unsafe void SetWindowsGraphicalUserInterfaceBit(MemoryMappedViewAccessor accessor)
{
- byte* pointer = null;
-
- try
- {
- accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref pointer);
- byte* bytes = pointer + accessor.PointerOffset;
-
- // https://en.wikipedia.org/wiki/Portable_Executable
- uint peHeaderOffset = ((uint*)(bytes + PEOffsets.DosStub.PESignatureOffset))[0];
-
- if (accessor.Capacity < peHeaderOffset + PEOffsets.PEHeader.Subsystem + sizeof(ushort))
- {
- throw new AppHostNotPEFileException("Subsystem offset out of file range.");
- }
-
- ushort* subsystem = ((ushort*)(bytes + peHeaderOffset + PEOffsets.PEHeader.Subsystem));
-
- // https://docs.microsoft.com/en-us/windows/desktop/Debug/pe-format#windows-subsystem
- // The subsystem of the prebuilt apphost should be set to CUI
- if (subsystem[0] != (ushort)PEOffsets.Subsystem.WindowsCui)
- {
- throw new AppHostNotCUIException(subsystem[0]);
- }
-
- // Set the subsystem to GUI
- subsystem[0] = (ushort)PEOffsets.Subsystem.WindowsGui;
- }
- finally
- {
- if (pointer != null)
- {
- accessor.SafeMemoryMappedViewHandle.ReleasePointer();
- }
- }
+ // https://learn.microsoft.com/windows/win32/debug/pe-format#windows-subsystem
+ // The subsystem of the prebuilt apphost should be set to CUI
+ uint peHeaderOffset;
+ ushort subsystem = GetWindowsSubsystem(accessor, out peHeaderOffset);
+ if (subsystem != (ushort)Subsystem.WindowsCui)
+ throw new AppHostNotCUIException(subsystem);
+
+ // Set the subsystem to GUI
+ accessor.Write(peHeaderOffset + PEOffsets.PEHeader.Subsystem, AsLittleEndian((ushort)Subsystem.WindowsGui));
}
public static unsafe void SetWindowsGraphicalUserInterfaceBit(string filePath)
@@ -113,32 +75,7 @@ public static unsafe void SetWindowsGraphicalUserInterfaceBit(string filePath)
/// The memory accessor which has the apphost file opened.
internal static unsafe ushort GetWindowsGraphicalUserInterfaceBit(MemoryMappedViewAccessor accessor)
{
- byte* pointer = null;
-
- try
- {
- accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref pointer);
- byte* bytes = pointer + accessor.PointerOffset;
-
- // https://en.wikipedia.org/wiki/Portable_Executable
- uint peHeaderOffset = ((uint*)(bytes + PEOffsets.DosStub.PESignatureOffset))[0];
-
- if (accessor.Capacity < peHeaderOffset + PEOffsets.PEHeader.Subsystem + sizeof(ushort))
- {
- throw new AppHostNotPEFileException("Subsystem offset out of file range.");
- }
-
- ushort* subsystem = ((ushort*)(bytes + peHeaderOffset + PEOffsets.PEHeader.Subsystem));
-
- return subsystem[0];
- }
- finally
- {
- if (pointer != null)
- {
- accessor.SafeMemoryMappedViewHandle.ReleasePointer();
- }
- }
+ return GetWindowsSubsystem(accessor, out _);
}
public static unsafe ushort GetWindowsGraphicalUserInterfaceBit(string filePath)
@@ -151,5 +88,25 @@ public static unsafe ushort GetWindowsGraphicalUserInterfaceBit(string filePath)
}
}
}
+
+ private static ushort GetWindowsSubsystem(MemoryMappedViewAccessor accessor, out uint peHeaderOffset)
+ {
+ // https://en.wikipedia.org/wiki/Portable_Executable
+ if (accessor.Capacity < PEOffsets.DosStub.PESignatureOffset + sizeof(uint))
+ throw new AppHostNotPEFileException("PESignature offset out of file range.");
+
+ peHeaderOffset = AsLittleEndian(accessor.ReadUInt32(PEOffsets.DosStub.PESignatureOffset));
+ if (accessor.Capacity < peHeaderOffset + PEOffsets.PEHeader.Subsystem + sizeof(ushort))
+ throw new AppHostNotPEFileException("Subsystem offset out of file range.");
+
+ // https://learn.microsoft.com/windows/win32/debug/pe-format#windows-subsystem
+ return AsLittleEndian(accessor.ReadUInt16(peHeaderOffset + PEOffsets.PEHeader.Subsystem));
+ }
+
+ private static ushort AsLittleEndian(ushort value)
+ => BitConverter.IsLittleEndian ? value : BinaryPrimitives.ReverseEndianness(value);
+
+ private static uint AsLittleEndian(uint value)
+ => BitConverter.IsLittleEndian ? value : BinaryPrimitives.ReverseEndianness(value);
}
}
diff --git a/src/installer/pkg/THIRD-PARTY-NOTICES.TXT b/src/installer/pkg/THIRD-PARTY-NOTICES.TXT
index fcb519506d511e..237af34f098f15 100644
--- a/src/installer/pkg/THIRD-PARTY-NOTICES.TXT
+++ b/src/installer/pkg/THIRD-PARTY-NOTICES.TXT
@@ -449,8 +449,8 @@ Foundation, Inc., Hewlett-Packard Company, Microsoft, nor Digital
Equipment Corporation makes any representations about the
suitability of this software for any purpose."
-License notice for The LLVM Compiler Infrastructure
----------------------------------------------------
+License notice for The LLVM Compiler Infrastructure (Legacy License)
+--------------------------------------------------------------------
Developed by:
@@ -1481,3 +1481,342 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+---
+
+Copyright (c) 2015, Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+License for C# Implementation of Fast CRC Computation
+-----------------------------------------------------
+
+https://github.com/SixLabors/ImageSharp/blob/f4f689ce67ecbcc35cebddba5aacb603e6d1068a/src/ImageSharp/Formats/Png/Zlib/Crc32.cs
+
+Copyright (c) Six Labors.
+Licensed under the Apache License, Version 2.0.
+
+Available at
+https://github.com/SixLabors/ImageSharp/blob/f4f689ce67ecbcc35cebddba5aacb603e6d1068a/LICENSE
+
+License for Fast CRC Computation
+--------------------------------------
+
+https://github.com/intel/isa-l/blob/33a2d9484595c2d6516c920ce39a694c144ddf69/crc/crc32_ieee_by4.asm
+https://github.com/intel/isa-l/blob/33a2d9484595c2d6516c920ce39a694c144ddf69/crc/crc64_ecma_norm_by8.asm
+
+Copyright(c) 2011-2015 Intel Corporation All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Intel Corporation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License for fastmod (https://github.com/lemire/fastmod), ibm-fpgen (https://github.com/nigeltao/parse-number-fxx-test-data) and fastrange (https://github.com/lemire/fastrange)
+--------------------------------------
+
+ Copyright 2018 Daniel Lemire
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+License for Jb Evain
+---------------------
+
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+--- Optional exception to the license ---
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into a machine-executable object form of such
+source code, you may redistribute such embedded portions in such object form
+without including the above copyright and permission notices.
+
+License for MurmurHash3
+--------------------------------------
+
+https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
+
+MurmurHash3 was written by Austin Appleby, and is placed in the public
+domain. The author hereby disclaims copyright to this source
+
+License notice for The LLVM Project
+-----------------------------------
+
+Copyright 2019 LLVM Project
+
+Licensed under the Apache License, Version 2.0 (the "License") with LLVM Exceptions;
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+https://llvm.org/LICENSE.txt
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+License for sse4-strstr (https://github.com/WojciechMula/sse4-strstr)
+--------------------------------------
+
+ Copyright (c) 2008-2016, Wojciech Mula
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License for the Teddy multi-substring searching implementation
+--------------------------------------
+
+https://github.com/BurntSushi/aho-corasick
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Andrew Gallant
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+License notice for amd/aocl-libm-ose
+-------------------------------
+
+Copyright (C) 2008-2020 Advanced Micro Devices, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+License notice for code from The Practice of Programming
+-------------------------------
+
+Copyright (C) 1999 Lucent Technologies
+
+Excerpted from 'The Practice of Programming
+by Brian W. Kernighan and Rob Pike
+
+You may use this code for any purpose, as long as you leave the copyright notice and book citation attached.
+
+License notice for fmtlib/fmt
+-------------------------------
+
+Formatting library for C++
+
+Copyright (c) 2012 - present, Victor Zverovich
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License notice for gRPC
+===================================
+
+Copyright 2019 The gRPC Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+License notice for m-ou-se/floatconv
+-------------------------------
+
+Copyright (c) 2020 Mara Bos
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License notice for MsQuic
+--------------------------------------
+
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT License.
+
+Available at
+https://github.com/microsoft/msquic/blob/main/LICENSE
+
+License notice for vectorized hex parsing
+--------------------------------------------------------
+
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2022, Wojciech Mula
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Notice for Euclidean Affine Functions and Applications to Calendar
+Algorithms
+-------------------------------
+
+Aspects of Date/Time processing based on algorithm described in "Euclidean Affine Functions and Applications to Calendar
+Algorithms", Cassio Neri and Lorenz Schneider. https://arxiv.org/pdf/2102.06959.pdf
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index 13cf1fc895c8ac..c44ffae5a7caff 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -155,9 +155,6 @@
-
-
-
@@ -197,6 +194,8 @@
+
+
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
index ba597425bcfc1d..979432e74e5fa8 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
@@ -7,8 +7,8 @@
dotnet-runtime-internal
dotnet-runtime
dotnet-runtime-internal
- $(SharedFrameworkName).PGO
true
+ false
dotnet-runtime-symbols
NetCore.SharedFramework
true
diff --git a/src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs b/src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs
index 20e7e97a628e96..12501889471756 100644
--- a/src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs
+++ b/src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs
@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
.And.FindAnySdk(false);
}
+ [Fact]
+ public void DotNetInfo_NoSDK()
+ {
+ sharedTestState.BuiltDotNet.Exec("--info")
+ .CaptureStdOut()
+ .CaptureStdErr()
+ .Execute()
+ .Should().Pass()
+ .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
+ .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
+ }
+
+ [Fact]
+ public void DotNetInfo_WithSDK()
+ {
+ DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
+ .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
+ .AddMockSDK("1.0.0", "1.0.0")
+ .Build();
+
+ dotnet.Exec("--info")
+ .WorkingDirectory(sharedTestState.BaseDirectory.Location)
+ .CaptureStdOut()
+ .CaptureStdErr()
+ .Execute()
+ .Should().Pass()
+ .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
+ }
+
// Return a non-existent path that contains a mix of / and \
private string GetNonexistentAndUnnormalizedPath()
{
diff --git a/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs b/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs
index 232410be8f2596..b4d038b99b5ce3 100644
--- a/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs
+++ b/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs
@@ -11,6 +11,7 @@
using Microsoft.NET.HostModel.AppHost;
using Microsoft.DotNet.CoreSetup.Test;
using System.Diagnostics;
+using System.Reflection.PortableExecutable;
namespace Microsoft.NET.HostModel.Tests
{
@@ -111,7 +112,9 @@ public void ItCanSetWindowsGUISubsystem()
BitConverter
.ToUInt16(File.ReadAllBytes(destinationFilePath), SubsystemOffset)
.Should()
- .Be(2);
+ .Be((ushort)Subsystem.WindowsGui);
+
+ Assert.Equal((ushort)Subsystem.WindowsGui, PEUtils.GetWindowsGraphicalUserInterfaceBit(destinationFilePath));
}
}
@@ -153,6 +156,7 @@ public void ItFailsToSetGUISubsystemWithWrongDefault()
string destinationFilePath = Path.Combine(testDirectory.Path, "DestinationAppHost.exe.mock");
string appBinaryFilePath = "Test/App/Binary/Path.dll";
+ Assert.Equal(42, PEUtils.GetWindowsGraphicalUserInterfaceBit(sourceAppHostMock));
Assert.Throws(() =>
HostWriter.CreateAppHost(
sourceAppHostMock,
diff --git a/src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs b/src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs
index f939ba1388336b..f312913aff8a05 100644
--- a/src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs
+++ b/src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs
@@ -74,6 +74,13 @@ public AndConstraint HaveStdOutMatching(string pattern,
return new AndConstraint(this);
}
+ public AndConstraint NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
+ {
+ Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
+ .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
+ return new AndConstraint(this);
+ }
+
public AndConstraint HaveStdErr()
{
Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
diff --git a/src/libraries/Common/src/Roslyn/DiagnosticDescriptorHelper.cs b/src/libraries/Common/src/Roslyn/DiagnosticDescriptorHelper.cs
index d11fdd8b5aaa03..8c5783ff9bd0b4 100644
--- a/src/libraries/Common/src/Roslyn/DiagnosticDescriptorHelper.cs
+++ b/src/libraries/Common/src/Roslyn/DiagnosticDescriptorHelper.cs
@@ -17,7 +17,7 @@ public static DiagnosticDescriptor Create(
LocalizableString? description = null,
params string[] customTags)
{
- string helpLink = $"https://learn.microsoft.com/dotnet/fundamentals/syslib-diagnostics/{id.ToLowerInvariant()}.md";
+ string helpLink = $"https://learn.microsoft.com/dotnet/fundamentals/syslib-diagnostics/{id.ToLowerInvariant()}";
return new DiagnosticDescriptor(id, title, messageFormat, category, defaultSeverity, isEnabledByDefault, description, helpLink, customTags);
}
diff --git a/src/libraries/Common/src/SourceGenerators/DiagnosticInfo.cs b/src/libraries/Common/src/SourceGenerators/DiagnosticInfo.cs
new file mode 100644
index 00000000000000..74f44f99c62baa
--- /dev/null
+++ b/src/libraries/Common/src/SourceGenerators/DiagnosticInfo.cs
@@ -0,0 +1,60 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Linq;
+using System.Numerics.Hashing;
+using Microsoft.CodeAnalysis;
+
+namespace SourceGenerators;
+
+///
+/// Descriptor for diagnostic instances using structural equality comparison.
+/// Provides a work-around for https://github.com/dotnet/roslyn/issues/68291.
+///
+internal readonly struct DiagnosticInfo : IEquatable
+{
+ public DiagnosticDescriptor Descriptor { get; private init; }
+ public object?[] MessageArgs { get; private init; }
+ public Location? Location { get; private init; }
+
+ public static DiagnosticInfo Create(DiagnosticDescriptor descriptor, Location? location, object?[]? messageArgs)
+ {
+ Location? trimmedLocation = location is null ? null : GetTrimmedLocation(location);
+
+ return new DiagnosticInfo
+ {
+ Descriptor = descriptor,
+ Location = trimmedLocation,
+ MessageArgs = messageArgs ?? Array.Empty()
+ };
+
+ // Creates a copy of the Location instance that does not capture a reference to Compilation.
+ static Location GetTrimmedLocation(Location location)
+ => Location.Create(location.SourceTree?.FilePath ?? "", location.SourceSpan, location.GetLineSpan().Span);
+ }
+
+ public Diagnostic CreateDiagnostic()
+ => Diagnostic.Create(Descriptor, Location, MessageArgs);
+
+ public override readonly bool Equals(object? obj) => obj is DiagnosticInfo info && Equals(info);
+
+ public readonly bool Equals(DiagnosticInfo other)
+ {
+ return Descriptor.Equals(other.Descriptor) &&
+ MessageArgs.SequenceEqual(other.MessageArgs) &&
+ Location == other.Location;
+ }
+
+ public override readonly int GetHashCode()
+ {
+ int hashCode = Descriptor.GetHashCode();
+ foreach (object? messageArg in MessageArgs)
+ {
+ hashCode = HashHelpers.Combine(hashCode, messageArg?.GetHashCode() ?? 0);
+ }
+
+ hashCode = HashHelpers.Combine(hashCode, Location?.GetHashCode() ?? 0);
+ return hashCode;
+ }
+}
diff --git a/src/libraries/System.Text.Json/gen/Helpers/ImmutableEquatableArray.cs b/src/libraries/Common/src/SourceGenerators/ImmutableEquatableArray.cs
similarity index 85%
rename from src/libraries/System.Text.Json/gen/Helpers/ImmutableEquatableArray.cs
rename to src/libraries/Common/src/SourceGenerators/ImmutableEquatableArray.cs
index ac3aa804fdd9dc..47fdde1751882a 100644
--- a/src/libraries/System.Text.Json/gen/Helpers/ImmutableEquatableArray.cs
+++ b/src/libraries/Common/src/SourceGenerators/ImmutableEquatableArray.cs
@@ -1,12 +1,13 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Numerics.Hashing;
-namespace System.Text.Json.SourceGeneration
+namespace SourceGenerators
{
///
/// Provides an immutable list implementation which implements sequence equality.
@@ -72,15 +73,9 @@ public bool MoveNext()
}
}
- public static class ImmutableEquatableArray
+ internal static class ImmutableEquatableArray
{
- public static ImmutableEquatableArray Empty() where T : IEquatable
- => ImmutableEquatableArray.Empty;
-
public static ImmutableEquatableArray ToImmutableEquatableArray(this IEnumerable values) where T : IEquatable
=> new(values);
-
- public static ImmutableEquatableArray Create(params T[] values) where T : IEquatable
- => values is { Length: > 0 } ? new(values) : ImmutableEquatableArray.Empty;
}
}
diff --git a/src/libraries/Common/src/SourceGenerators/TypeModelHelper.cs b/src/libraries/Common/src/SourceGenerators/TypeModelHelper.cs
new file mode 100644
index 00000000000000..7a3a3e98fd7fde
--- /dev/null
+++ b/src/libraries/Common/src/SourceGenerators/TypeModelHelper.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+
+namespace SourceGenerators
+{
+ internal static class TypeModelHelper
+ {
+ public static List? GetAllTypeArgumentsInScope(this INamedTypeSymbol type)
+ {
+ if (!type.IsGenericType)
+ {
+ return null;
+ }
+
+ List? args = null;
+ TraverseContainingTypes(type);
+ return args;
+
+ void TraverseContainingTypes(INamedTypeSymbol current)
+ {
+ if (current.ContainingType is INamedTypeSymbol parent)
+ {
+ TraverseContainingTypes(parent);
+ }
+
+ if (!current.TypeArguments.IsEmpty)
+ {
+ (args ??= new()).AddRange(current.TypeArguments);
+ }
+ }
+ }
+
+ public static string GetFullyQualifiedName(this ITypeSymbol type) => type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+ }
+}
diff --git a/src/libraries/System.Text.Json/gen/Model/TypeRef.cs b/src/libraries/Common/src/SourceGenerators/TypeRef.cs
similarity index 96%
rename from src/libraries/System.Text.Json/gen/Model/TypeRef.cs
rename to src/libraries/Common/src/SourceGenerators/TypeRef.cs
index 050aba0cda658c..cfbf33ed741366 100644
--- a/src/libraries/System.Text.Json/gen/Model/TypeRef.cs
+++ b/src/libraries/Common/src/SourceGenerators/TypeRef.cs
@@ -1,10 +1,11 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System;
using System.Diagnostics;
using Microsoft.CodeAnalysis;
-namespace System.Text.Json.SourceGeneration
+namespace SourceGenerators
{
///
/// An equatable value representing type identity.
diff --git a/src/libraries/Common/src/System/Net/Http/X509ResourceClient.cs b/src/libraries/Common/src/System/Net/Http/X509ResourceClient.cs
index 57538487800e1e..74e84bb750386a 100644
--- a/src/libraries/Common/src/System/Net/Http/X509ResourceClient.cs
+++ b/src/libraries/Common/src/System/Net/Http/X509ResourceClient.cs
@@ -12,6 +12,9 @@ namespace System.Net.Http
{
internal static partial class X509ResourceClient
{
+ private const long DefaultAiaDownloadLimit = 100 * 1024 * 1024;
+ private static long AiaDownloadLimit { get; } = GetValue("System.Security.Cryptography.AiaDownloadLimit", DefaultAiaDownloadLimit);
+
private static readonly Func>? s_downloadBytes = CreateDownloadBytesFunc();
static partial void ReportNoClient();
@@ -111,6 +114,7 @@ internal static partial class X509ResourceClient
ConstructorInfo? httpRequestMessageCtor = httpRequestMessageType.GetConstructor(Type.EmptyTypes);
MethodInfo? sendMethod = httpClientType.GetMethod("Send", new Type[] { httpRequestMessageType, typeof(CancellationToken) });
MethodInfo? sendAsyncMethod = httpClientType.GetMethod("SendAsync", new Type[] { httpRequestMessageType, typeof(CancellationToken) });
+ PropertyInfo? maxResponseContentBufferSizeProp = httpClientType.GetProperty("MaxResponseContentBufferSize");
PropertyInfo? responseContentProp = httpResponseMessageType.GetProperty("Content");
PropertyInfo? responseStatusCodeProp = httpResponseMessageType.GetProperty("StatusCode");
PropertyInfo? responseHeadersProp = httpResponseMessageType.GetProperty("Headers");
@@ -121,7 +125,7 @@ internal static partial class X509ResourceClient
if (socketsHttpHandlerCtor == null || pooledConnectionIdleTimeoutProp == null ||
allowAutoRedirectProp == null || httpClientCtor == null ||
requestUriProp == null || httpRequestMessageCtor == null ||
- sendMethod == null || sendAsyncMethod == null ||
+ sendMethod == null || sendAsyncMethod == null || maxResponseContentBufferSizeProp == null ||
responseContentProp == null || responseStatusCodeProp == null ||
responseHeadersProp == null || responseHeadersLocationProp == null ||
readAsStreamMethod == null || taskOfHttpResponseMessageResultProp == null)
@@ -145,6 +149,7 @@ internal static partial class X509ResourceClient
pooledConnectionIdleTimeoutProp.SetValue(socketsHttpHandler, TimeSpan.FromSeconds(PooledConnectionIdleTimeoutSeconds));
allowAutoRedirectProp.SetValue(socketsHttpHandler, false);
object? httpClient = httpClientCtor.Invoke(new object?[] { socketsHttpHandler });
+ maxResponseContentBufferSizeProp.SetValue(httpClient, AiaDownloadLimit);
return async (string uriString, CancellationToken cancellationToken, bool async) =>
{
@@ -302,5 +307,24 @@ private static bool IsAllowedScheme(string scheme)
{
return string.Equals(scheme, "http", StringComparison.OrdinalIgnoreCase);
}
+
+ private static long GetValue(string name, long defaultValue)
+ {
+ object? data = AppContext.GetData(name);
+
+ if (data is null)
+ {
+ return defaultValue;
+ }
+
+ try
+ {
+ return Convert.ToInt64(data);
+ }
+ catch
+ {
+ return defaultValue;
+ }
+ }
}
}
diff --git a/src/libraries/Common/src/System/Net/TlsStream.cs b/src/libraries/Common/src/System/Net/TlsStream.cs
index 047253159127ea..503253099aac17 100644
--- a/src/libraries/Common/src/System/Net/TlsStream.cs
+++ b/src/libraries/Common/src/System/Net/TlsStream.cs
@@ -5,6 +5,8 @@
using System.Net.Sockets;
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
namespace System.Net
{
@@ -46,6 +48,11 @@ public void EndAuthenticateAsClient(IAsyncResult asyncResult)
_sslStream.EndAuthenticateAsClient(asyncResult);
}
+ public override void Write(byte[] buffer, int offset, int size)
+ {
+ _sslStream.Write(buffer, offset, size);
+ }
+
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback? callback, object? state)
{
return _sslStream.BeginWrite(buffer, offset, size, callback, state);
@@ -56,9 +63,9 @@ public override void EndWrite(IAsyncResult result)
_sslStream.EndWrite(result);
}
- public override void Write(byte[] buffer, int offset, int size)
+ public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
- _sslStream.Write(buffer, offset, size);
+ return _sslStream.WriteAsync(buffer, offset, count, cancellationToken);
}
public override int Read(byte[] buffer, int offset, int size)
@@ -66,6 +73,11 @@ public override int Read(byte[] buffer, int offset, int size)
return _sslStream.Read(buffer, offset, size);
}
+ public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+ {
+ return _sslStream.ReadAsync(buffer, offset, count, cancellationToken);
+ }
+
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state)
{
return _sslStream.BeginRead(buffer, offset, count, callback, state);
diff --git a/src/libraries/Common/tests/SourceGenerators/GeneratorTestHelpers.cs b/src/libraries/Common/tests/SourceGenerators/GeneratorTestHelpers.cs
new file mode 100644
index 00000000000000..d62a3c788e73dc
--- /dev/null
+++ b/src/libraries/Common/tests/SourceGenerators/GeneratorTestHelpers.cs
@@ -0,0 +1,84 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Xunit;
+
+namespace SourceGenerators.Tests
+{
+ internal static class GeneratorTestHelpers
+ {
+ ///
+ /// Asserts for structural equality, returning a path to the mismatching data when not equal.
+ ///
+ public static void AssertStructurallyEqual(T expected, T actual)
+ {
+ CheckAreEqualCore(expected, actual, new());
+ static void CheckAreEqualCore(object expected, object actual, Stack path)
+ {
+ if (expected is null || actual is null)
+ {
+ if (expected is not null || actual is not null)
+ {
+ FailNotEqual();
+ }
+
+ return;
+ }
+
+ Type type = expected.GetType();
+ if (type != actual.GetType())
+ {
+ FailNotEqual();
+ return;
+ }
+
+ if (expected is IEnumerable leftCollection)
+ {
+ if (actual is not IEnumerable rightCollection)
+ {
+ FailNotEqual();
+ return;
+ }
+
+ object?[] expectedValues = leftCollection.Cast().ToArray();
+ object?[] actualValues = rightCollection.Cast().ToArray();
+
+ for (int i = 0; i < Math.Max(expectedValues.Length, actualValues.Length); i++)
+ {
+ object? expectedElement = i < expectedValues.Length ? expectedValues[i] : "";
+ object? actualElement = i < actualValues.Length ? actualValues[i] : "";
+
+ path.Push($"[{i}]");
+ CheckAreEqualCore(expectedElement, actualElement, path);
+ path.Pop();
+ }
+ }
+
+ if (type.GetProperty("EqualityContract", BindingFlags.Instance | BindingFlags.NonPublic, null, returnType: typeof(Type), types: Array.Empty(), null) != null)
+ {
+ // Type is a C# record, run pointwise equality comparison.
+ foreach (PropertyInfo property in type.GetProperties(BindingFlags.Public | BindingFlags.Instance))
+ {
+ path.Push("." + property.Name);
+ CheckAreEqualCore(property.GetValue(expected), property.GetValue(actual), path);
+ path.Pop();
+ }
+
+ return;
+ }
+
+ if (!expected.Equals(actual))
+ {
+ FailNotEqual();
+ }
+
+ void FailNotEqual() => Assert.Fail($"Value not equal in ${string.Join("", path.Reverse())}: expected {expected}, but was {actual}.");
+ }
+ }
+ }
+}
diff --git a/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs b/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs
index 2b4568a79eaba0..e67289721d8af9 100644
--- a/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs
+++ b/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs
@@ -91,7 +91,7 @@ public static async Task AssertNoDiagnostic(this Project proj, params string[] i
}
}
- private static Project WithDocuments(this Project project, IEnumerable sources, IEnumerable? sourceNames = null)
+ public static Project WithDocuments(this Project project, IEnumerable sources, IEnumerable? sourceNames = null)
{
int count = 0;
Project result = project;
diff --git a/src/libraries/Common/tests/System/FunctionPointerTests.cs b/src/libraries/Common/tests/System/FunctionPointerTests.cs
index 925c8683f8f7f4..8a344e01e78955 100644
--- a/src/libraries/Common/tests/System/FunctionPointerTests.cs
+++ b/src/libraries/Common/tests/System/FunctionPointerTests.cs
@@ -173,6 +173,22 @@ public static unsafe void RequiredModifiers()
Assert.Equal(typeof(Runtime.InteropServices.OutAttribute).Project(), parameters[1].GetRequiredCustomModifiers()[0]);
}
+ [Fact]
+ public static unsafe void GenericFunctionPointer()
+ {
+ Type t = typeof(FunctionPointerHolder).Project();
+
+ MethodInfo m1 = t.GetMethod(nameof(FunctionPointerHolder.GenericReturnValue), Bindings);
+ Type fcnPtr1 = m1.ReturnType;
+ Assert.True(fcnPtr1.IsFunctionPointer);
+ Assert.True(fcnPtr1.ContainsGenericParameters);
+
+ MethodInfo m2 = t.GetMethod(nameof(FunctionPointerHolder.GenericArgument), Bindings);
+ Type fcnPtr2 = m2.GetParameters()[1].ParameterType;
+ Assert.True(fcnPtr2.IsFunctionPointer);
+ Assert.True(fcnPtr2.ContainsGenericParameters);
+ }
+
[Theory]
[InlineData(nameof(FunctionPointerHolder.MethodReturnValue1),
"MethodReturnValue1()",
@@ -278,6 +294,9 @@ private unsafe class FunctionPointerHolder
public delegate* unmanaged[Stdcall, MemberFunction] SeveralArguments() => default;
public delegate* RequiredModifiers() => default;
+ public delegate* GenericReturnValue() => default;
+ public bool GenericArgument(int x, delegate* fptr) => default;
+
public class MyClass { }
public struct MyStruct { }
}
diff --git a/src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs b/src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs
index ec5c7a022c65a6..9d6fef5fb3a720 100644
--- a/src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs
+++ b/src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs
@@ -108,11 +108,6 @@ public static int GetRequestId(QuicStream stream)
return checked((int)stream.Id + 1);
}
- public Http3LoopbackStream GetOpenRequest(int requestId = 0)
- {
- return requestId == 0 ? _currentStream : _openStreams[requestId - 1];
- }
-
public override Task InitializeConnectionAsync()
{
throw new NotImplementedException();
@@ -195,6 +190,17 @@ public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
}
+ public async Task DisposeCurrentStream()
+ {
+ Assert.NotNull(_currentStream);
+ Assert.True(_currentStreamId >= 0);
+
+ await _currentStream.DisposeAsync().ConfigureAwait(false);
+ _openStreams.Remove((int)_currentStreamId);
+ _currentStream = null;
+ _currentStreamId = -4;
+ }
+
public override async Task ReadRequestBodyAsync()
{
return await _currentStream.ReadRequestBodyAsync().ConfigureAwait(false);
@@ -206,24 +212,32 @@ public override async Task ReadRequestDataAsync(bool readBody =
return await stream.ReadRequestDataAsync(readBody).ConfigureAwait(false);
}
- public override Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList headers = null, string content = "", bool isFinal = true)
+ public override async Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList headers = null, string content = "", bool isFinal = true)
{
- return GetOpenRequest().SendResponseAsync(statusCode, headers, content, isFinal);
+ await _currentStream.SendResponseAsync(statusCode, headers, content, isFinal);
+ if (isFinal)
+ {
+ await DisposeCurrentStream().ConfigureAwait(false);
+ }
}
- public override Task SendResponseBodyAsync(byte[] content, bool isFinal = true)
+ public override async Task SendResponseBodyAsync(byte[] content, bool isFinal = true)
{
- return GetOpenRequest().SendResponseBodyAsync(content, isFinal);
+ await _currentStream.SendResponseBodyAsync(content, isFinal);
+ if (isFinal)
+ {
+ await DisposeCurrentStream().ConfigureAwait(false);
+ }
}
public override Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList headers = null)
{
- return GetOpenRequest().SendResponseHeadersAsync(statusCode, headers);
+ return _currentStream.SendResponseHeadersAsync(statusCode, headers);
}
public override Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList headers = null)
{
- return GetOpenRequest().SendPartialResponseHeadersAsync(statusCode, headers);
+ return _currentStream.SendPartialResponseHeadersAsync(statusCode, headers);
}
public override async Task HandleRequestAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList headers = null, string content = "")
@@ -310,7 +324,7 @@ public async Task WaitForClientDisconnectAsync(bool refuseNewRequests = true)
public override async Task WaitForCancellationAsync(bool ignoreIncomingData = true)
{
- await GetOpenRequest().WaitForCancellationAsync(ignoreIncomingData).ConfigureAwait(false);
+ await _currentStream.WaitForCancellationAsync(ignoreIncomingData).ConfigureAwait(false);
}
public override Task WaitForCloseAsync(CancellationToken cancellationToken)
diff --git a/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs b/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
index bf676b7b6f26be..230e4cb4276a42 100644
--- a/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
@@ -15,6 +16,26 @@ public static class AssertExtensions
{
private static bool IsNetFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework");
+
+ ///
+ /// Helper for AOT tests that verifies that the compile succeeds, or throws PlatformNotSupported
+ /// when AOT is enabled.
+ ///
+ public static void ThrowsOnAot(Action action)
+ where T : Exception
+ {
+#if NETCOREAPP // Dynamic code is always supported on .NET Framework
+ if (!RuntimeFeature.IsDynamicCodeSupported)
+ {
+ Assert.Throws(action);
+ }
+ else
+#endif
+ {
+ action();
+ }
+ }
+
public static void Throws(Action action, string expectedMessage)
where T : Exception
{
diff --git a/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Unix.cs b/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Unix.cs
index b127a2a72491e9..c8197b0055092f 100644
--- a/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Unix.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Unix.cs
@@ -30,6 +30,8 @@ public UnixImplementation(int elementCount)
public override bool IsReadonly => false;
+ public override int Length => _elementCount;
+
public override Memory Memory => _memoryManager.Memory;
public override Span Span
@@ -83,10 +85,7 @@ protected override void Dispose(bool disposing)
// no-op; the handle will be disposed separately
}
- public override Span GetSpan()
- {
- throw new NotImplementedException();
- }
+ public override Span GetSpan() => _impl.Span;
public override MemoryHandle Pin(int elementIndex)
{
diff --git a/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Windows.cs b/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Windows.cs
index 7b1cbbafc72dbc..96f40d61492e52 100644
--- a/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Windows.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.Windows.cs
@@ -81,6 +81,8 @@ internal WindowsImplementation(VirtualAllocHandle handle, int byteOffsetIntoHand
public override bool IsReadonly => (Protection != VirtualAllocProtection.PAGE_READWRITE);
+ public override int Length => _elementCount;
+
internal VirtualAllocProtection Protection
{
get
@@ -189,10 +191,7 @@ protected override void Dispose(bool disposing)
// no-op; the handle will be disposed separately
}
- public override Span GetSpan()
- {
- throw new NotImplementedException();
- }
+ public override Span GetSpan() => _impl.Span;
public override MemoryHandle Pin(int elementIndex)
{
diff --git a/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.cs b/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.cs
index d70b30721fdbd9..81d359cc80e926 100644
--- a/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/Buffers/BoundedMemory.cs
@@ -14,6 +14,9 @@ public abstract class BoundedMemory : IDisposable where T : unmanaged
///
public abstract bool IsReadonly { get; }
+ /// Gets the length of the instance.
+ public abstract int Length { get; }
+
///
/// Gets the which represents this native memory.
/// This instance must be kept alive while working with the .
@@ -44,5 +47,23 @@ public abstract class BoundedMemory : IDisposable where T : unmanaged
/// OS does not support marking the memory block as read+write.
///
public abstract void MakeWriteable();
+
+ ///
+ /// Gets the which represents this native memory.
+ /// This instance must be kept alive while working with the .
+ ///
+ public static implicit operator Span(BoundedMemory boundedMemory) => boundedMemory.Span;
+
+ ///
+ /// Gets the which represents this native memory.
+ /// This instance must be kept alive while working with the .
+ ///
+ public static implicit operator ReadOnlySpan(BoundedMemory boundedMemory) => boundedMemory.Span;
+
+ ///
+ /// Gets a reference to the element at the specified index.
+ /// This instance must be kept alive while working with the reference.
+ ///
+ public ref T this[int index] => ref Span[index];
}
}
diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/PACKAGE.md b/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/PACKAGE.md
new file mode 100644
index 00000000000000..e0c6e8ae9adaae
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/PACKAGE.md
@@ -0,0 +1,64 @@
+## About
+
+As of C# 8, the C# language has support for producing and consuming asynchronous iterators. The library types in support of those features are available in .NET Core 3.0 and newer as well as in .NET Standard 2.1. This library provides the necessary definitions of those types to support these language features on .NET Framework and on .NET Standard 2.0. This library is not necessary nor recommended when targeting versions of .NET that include the relevant support.
+
+## Key Features
+
+
+
+* Enables the use of C# async iterators on older .NET platforms
+
+## How to Use
+
+
+
+```C#
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+internal static class Program
+{
+ private static async Task Main()
+ {
+ Console.WriteLine("Starting...");
+ await foreach (var value in GetValuesAsync())
+ {
+ Console.WriteLine(value);
+ }
+ Console.WriteLine("Finished!");
+
+ static async IAsyncEnumerable GetValuesAsync()
+ {
+ for (int i = 0; i < 10; i++)
+ {
+ await Task.Delay(TimeSpan.FromSeconds(1));
+ yield return i;
+ }
+ }
+ }
+}
+```
+
+## Main Types
+
+
+
+The main types provided by this library are:
+
+* `IAsyncEnumerable`
+* `IAsyncEnumerator`
+* `IAsyncDisposable`
+
+## Additional Documentation
+
+
+
+* [C# Feature Specification](https://learn.microsoft.com/dotnet/csharp/language-reference/proposals/csharp-8.0/async-streams)
+* [Walkthrough article](https://learn.microsoft.com/archive/msdn-magazine/2019/november/csharp-iterating-with-async-enumerables-in-csharp-8)
+
+## Feedback & Contributing
+
+
+
+Microsoft.Bcl.AsyncInterfaces is released as open source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/runtime).
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln b/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln
new file mode 100644
index 00000000000000..1192785b14a9fc
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln
@@ -0,0 +1,74 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "ref\Microsoft.Bcl.Numerics.csproj", "{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "src\Microsoft.Bcl.Numerics.csproj", "{4D4BED71-8904-4A74-88CD-63D002CCACD0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics.Tests", "tests\Microsoft.Bcl.Numerics.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{E30F71EB-6C3B-4052-84F7-36EAA178A45E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0AE44453-273B-4F0E-9901-A87891A73C1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D6A9108E-553B-445E-A037-FA4F3140A279}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {51D9518A-464D-4257-9567-3BDCFF24F3EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {51D9518A-464D-4257-9567-3BDCFF24F3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {51D9518A-464D-4257-9567-3BDCFF24F3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {51D9518A-464D-4257-9567-3BDCFF24F3EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0AE44453-273B-4F0E-9901-A87891A73C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0AE44453-273B-4F0E-9901-A87891A73C1B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
+ {51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
+ {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB}
+ {4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
+ {E30F71EB-6C3B-4052-84F7-36EAA178A45E} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+ {0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+ {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {A835CEDB-E9E2-49EE-8499-BD7FDD984E53}
+ EndGlobalSection
+EndGlobal
diff --git a/src/coreclr/nativeaot/Runtime/GCMemoryHelpers.h b/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.Forwards.cs
similarity index 52%
rename from src/coreclr/nativeaot/Runtime/GCMemoryHelpers.h
rename to src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.Forwards.cs
index 127b4d772040ab..641ce5525675f4 100644
--- a/src/coreclr/nativeaot/Runtime/GCMemoryHelpers.h
+++ b/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.Forwards.cs
@@ -1,8 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-//
-// Unmanaged GC memory helpers
-//
-
-EXTERN_C void REDHAWK_CALLCONV RhpBulkWriteBarrier(void* pMemStart, uint32_t cbMemSize);
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MathF))]
diff --git a/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.cs b/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.cs
new file mode 100644
index 00000000000000..d952814464f676
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.cs
@@ -0,0 +1,42 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// ------------------------------------------------------------------------------
+// Changes to this file must follow the https://aka.ms/api-review process.
+// ------------------------------------------------------------------------------
+
+namespace System
+{
+ public static partial class MathF
+ {
+ public const float E = 2.7182817f;
+ public const float PI = 3.1415927f;
+ public static float Abs(float x) { throw null; }
+ public static float Acos(float x) { throw null; }
+ public static float Asin(float x) { throw null; }
+ public static float Atan(float x) { throw null; }
+ public static float Atan2(float y, float x) { throw null; }
+ public static float Ceiling(float x) { throw null; }
+ public static float Cos(float x) { throw null; }
+ public static float Cosh(float x) { throw null; }
+ public static float Exp(float x) { throw null; }
+ public static float Floor(float x) { throw null; }
+ public static float IEEERemainder(float x, float y) { throw null; }
+ public static float Log(float x) { throw null; }
+ public static float Log(float x, float y) { throw null; }
+ public static float Log10(float x) { throw null; }
+ public static float Max(float x, float y) { throw null; }
+ public static float Min(float x, float y) { throw null; }
+ public static float Pow(float x, float y) { throw null; }
+ public static float Round(float x) { throw null; }
+ public static float Round(float x, int digits) { throw null; }
+ public static float Round(float x, int digits, System.MidpointRounding mode) { throw null; }
+ public static float Round(float x, System.MidpointRounding mode) { throw null; }
+ public static int Sign(float x) { throw null; }
+ public static float Sin(float x) { throw null; }
+ public static float Sinh(float x) { throw null; }
+ public static float Sqrt(float x) { throw null; }
+ public static float Tan(float x) { throw null; }
+ public static float Tanh(float x) { throw null; }
+ public static float Truncate(float x) { throw null; }
+ }
+}
diff --git a/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.csproj b/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.csproj
new file mode 100644
index 00000000000000..36d3ac9605c195
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/ref/Microsoft.Bcl.Numerics.csproj
@@ -0,0 +1,12 @@
+
+
+
+ netstandard2.0;$(NetFrameworkMinimum);netstandard2.1
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Bcl.Numerics/src/Microsoft.Bcl.Numerics.csproj b/src/libraries/Microsoft.Bcl.Numerics/src/Microsoft.Bcl.Numerics.csproj
new file mode 100644
index 00000000000000..5d6b96dc6a29a8
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/src/Microsoft.Bcl.Numerics.csproj
@@ -0,0 +1,24 @@
+
+
+
+ netstandard2.0;$(NetFrameworkMinimum);netstandard2.1
+ true
+ true
+
+
+ Provides the System.MathF for .NET Standard 2.0
+
+ true
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Bcl.Numerics/src/PACKAGE.md b/src/libraries/Microsoft.Bcl.Numerics/src/PACKAGE.md
new file mode 100644
index 00000000000000..b19975c09f41f4
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/src/PACKAGE.md
@@ -0,0 +1,43 @@
+## About
+
+As of .NET Core 2.0 and .NET Standard 2.1, the C# language has support for math (System.MathF) functions with floats. This library provides the necessary definitions of those types to support these language features on .NET Framework and on .NET Standard 2.0. This library is not necessary nor recommended when targeting versions of .NET that include the relevant support.
+
+## Key Features
+
+
+
+* Enables the use of MathF on older .NET platforms
+
+## How to Use
+
+```C#
+using System;
+
+internal static class Program
+{
+ private static async Task Main()
+ {
+ Console.WriteLine(MathF.Max(1f, 5f)); // returns 5f
+ }
+}
+```
+
+## Main Types
+
+
+
+The main types provided by this library are:
+
+* `System.MathF`
+
+## Additional Documentation
+
+
+
+* [API documentation](https://learn.microsoft.com/dotnet/api/system.mathf)
+
+## Feedback & Contributing
+
+
+
+Microsoft.Bcl.Numerics is released as open source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/runtime).
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Bcl.Numerics/src/System/MathF.cs b/src/libraries/Microsoft.Bcl.Numerics/src/System/MathF.cs
new file mode 100644
index 00000000000000..128a3174ad0c4e
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/src/System/MathF.cs
@@ -0,0 +1,332 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+/*============================================================
+**
+** Purpose: Some single-precision floating-point math operations
+**
+===========================================================*/
+
+//This class contains only static members and doesn't require serialization.
+
+//For most of this implementation for .NET Framework we just defer to System.Math and do a cast internally from single to double.
+//We do this because it safer and less likely to break people since that is what they are alrady doing. Also, adding in the
+//extra pinvokes needed to not do this route would probably incur an extra overhead that would be undersired.
+
+//For any version of .NET Core this just forwards directly to the MathF implementation inside the runtime.
+
+//There are a few cases where .NET Framework handles things differently than .NET Core does. For example, it returns -0 and +0
+//when using things like Min/Max, and they count as different values from each other. This is fixed in .NET Core, but since its
+//inherent in .NET Framework we decided to leave that behavior as is for this BCL.
+
+using System.Diagnostics.Contracts;
+
+namespace System
+{
+ ///
+ /// Provides constants and static methods for trigonometric, logarithmic, and other common mathematical functions.
+ ///
+ public static class MathF
+ {
+ ///
+ /// Represents the ratio of the circumference of a circle to its diameter, specified by the constant, p.
+ ///
+ public const float PI = 3.14159265f;
+
+ ///
+ /// Represents the natural logarithmic base, specified by the constant, e.
+ ///
+ public const float E = 2.71828183f;
+
+ private static float NegativeZero = Int32BitsToSingle(unchecked((int)0x80000000));
+
+ private static unsafe float Int32BitsToSingle(int value)
+ {
+ return *((float*)&value);
+ }
+
+ [Pure]
+ private static unsafe bool IsNegative(float f)
+ {
+ return (*(uint*)(&f) & 0x80000000) == 0x80000000;
+ }
+
+ ///
+ /// Returns the absolute value of a single-precision floating-point number.
+ ///
+ /// The number to take the absolute value of.
+ /// The absolute value of
+ public static float Abs(float x) => Math.Abs(x);
+
+ ///
+ /// Returns the angle whose cosine is the specified number.
+ ///
+ /// The number to take the acos of.
+ /// The acos of
+ public static float Acos(float x) => (float)Math.Acos(x);
+
+ ///
+ /// Returns the angle whose sine is the specified number.
+ ///
+ /// The number to take the asin of.
+ /// The asin of
+ public static float Asin(float x) => (float)Math.Asin(x);
+
+ ///
+ /// Returns the angle whose tangent is the specified number.
+ ///
+ /// The number to take the atan of.
+ /// The atan of
+ public static float Atan(float x) => (float)Math.Atan(x);
+
+ ///
+ /// Returns the angle whose tangent is the quotient of two specified numbers.
+ ///
+ /// The first number.
+ /// The second number.
+ /// The angle whose tangent is the quotient of and
+ public static float Atan2(float y, float x) => (float)Math.Atan2(y, x);
+
+ ///
+ /// Returns the smallest integral value that is greater than or equal to the specified single-precision floating-point number.
+ ///
+ /// The number to take the ceiling of.
+ /// The ceiling of
+ public static float Ceiling(float x) => (float)Math.Ceiling(x);
+
+ ///
+ /// Returns the cosine of the specified angle.
+ ///
+ /// The angle to take the cosine of.
+ /// The cosine of
+ public static float Cos(float x) => (float)Math.Cos(x);
+
+ ///
+ /// Returns the hyperbolic cosine of the specified angle.
+ ///
+ /// The angle to take the hyperbolic cosine of.
+ /// The hyperbolic cosine of
+ public static float Cosh(float x) => (float)Math.Cosh(x);
+
+ ///
+ /// Returns e raised to the specified power.
+ ///
+ /// The number to raise e to.
+ /// e raised to the power of
+ public static float Exp(float x) => (float)Math.Exp(x);
+
+ ///
+ /// Returns the largest integral value less than or equal to the specified single-precision floating-point number.
+ ///
+ /// The number to take the floor of.
+ /// The floor of
+ public static float Floor(float x) => (float)Math.Floor(x);
+
+ ///
+ /// Returns the remainder resulting from the division of a specified number by another specified number.
+ ///
+ /// The numerator
+ /// The denominator
+ /// The result of dividing by
+ public static float IEEERemainder(float x, float y)
+ {
+ if (float.IsNaN(x))
+ {
+ return x; // IEEE 754-2008: NaN payload must be preserved
+ }
+
+ if (float.IsNaN(y))
+ {
+ return y; // IEEE 754-2008: NaN payload must be preserved
+ }
+
+ var regularMod = x % y;
+
+ if (float.IsNaN(regularMod))
+ {
+ return float.NaN;
+ }
+
+ if ((regularMod == 0) && IsNegative(x))
+ {
+ return NegativeZero;
+ }
+
+ var alternativeResult = (regularMod - (Abs(y) * Sign(x)));
+
+ if (Abs(alternativeResult) == Abs(regularMod))
+ {
+ var divisionResult = x / y;
+ var roundedResult = Round(divisionResult);
+
+ if (Abs(roundedResult) > Abs(divisionResult))
+ {
+ return alternativeResult;
+ }
+ else
+ {
+ return regularMod;
+ }
+ }
+
+ if (Abs(alternativeResult) < Abs(regularMod))
+ {
+ return alternativeResult;
+ }
+ else
+ {
+ return regularMod;
+ }
+ }
+
+ ///
+ /// Returns the natural (base e) logarithm of a specified number.
+ ///
+ /// The number to take the natural log of.
+ /// The natural log of
+ public static float Log(float x) => (float)Math.Log(x);
+
+ ///
+ /// Returns the logarithm of a specified number in a specified base.
+ ///
+ /// The number to take the log of.
+ /// The base of the log
+ /// The log of with base
+ public static float Log(float x, float y)
+ {
+ if (float.IsNaN(x))
+ {
+ return x; // IEEE 754-2008: NaN payload must be preserved
+ }
+
+ if (float.IsNaN(y))
+ {
+ return y; // IEEE 754-2008: NaN payload must be preserved
+ }
+
+ if (y == 1)
+ {
+ return float.NaN;
+ }
+
+ if ((x != 1) && ((y == 0) || float.IsPositiveInfinity(y)))
+ {
+ return float.NaN;
+ }
+
+ return Log(x) / Log(y);
+ }
+
+ ///
+ /// Returns the base 10 logarithm of a specified number.
+ ///
+ /// The number to take the base 10 log of.
+ /// The base 10 log of
+ public static float Log10(float x) => (float)Math.Log10(x);
+
+ ///
+ /// Returns the larger of two single-precision floating-point numbers.
+ ///
+ /// The first number to compare.
+ /// The second number to compare.
+ /// The larger of and
+ public static float Max(float x, float y) => Math.Max(x, y);
+
+ ///
+ /// Returns the smaller of two single-precision floating-point numbers.
+ ///
+ /// The first number to compare.
+ /// The second number to compare.
+ /// The smaller of and
+ public static float Min(float x, float y) => Math.Min(x, y);
+
+ ///
+ /// Returns a specified number raised to the specified power.
+ ///
+ /// The base number.
+ /// The specified power.
+ /// raised to the power of
+ public static float Pow(float x, float y) => (float)Math.Pow(x, y);
+
+ ///
+ /// Rounds a single-precision floating-point value to the nearest integral value, and rounds midpoint values to the nearest even number.
+ ///
+ /// The number to round.
+ /// The rounded representation of
+ public static float Round(float x) => (float)Math.Round(x);
+
+ ///
+ /// Rounds a single-precision floating-point value to a specified number of fractional digits, and rounds midpoint values to the nearest even number.
+ ///
+ /// The number to round.
+ /// How many fractional digits to keep.
+ /// The rounded representation of with fractional digits
+ public static float Round(float x, int digits) => (float)Math.Round(x, digits);
+
+ ///
+ /// Rounds a single-precision floating-point value to a specified number of fractional digits using the specified rounding convention.
+ ///
+ /// The number to round.
+ /// How many fractional digits to keep.
+ /// The rounding convention to use.
+ /// The rounded representation of with fractional digits using rounding convention
+ public static float Round(float x, int digits, MidpointRounding mode) => (float)Math.Round(x, digits, mode);
+
+ ///
+ /// Rounds a single-precision floating-point value to an integer using the specified rounding convention.
+ ///
+ /// The number to round.
+ /// The rounding convention to use.
+ /// The rounded representation of using rounding convention
+ public static float Round(float x, MidpointRounding mode) => (float)Math.Round(x, mode);
+
+ ///
+ /// Returns an integer that indicates the sign of a single-precision floating-point number.
+ ///
+ /// The number check the sign of.
+ /// The sign of
+ public static int Sign(float x) => Math.Sign(x);
+
+ ///
+ /// Returns the sine of the specified angle.
+ ///
+ /// The angle to take the sine of.
+ /// The sine of
+ public static float Sin(float x) => (float)Math.Sin(x);
+
+ ///
+ /// Returns the hyperbolic sine of the specified angle.
+ ///
+ /// The angle to take the hyperbolic sine of.
+ /// The hyperbolic sine of
+ public static float Sinh(float x) => (float)Math.Sinh(x);
+
+ ///
+ /// Returns the square root of a specified number.
+ ///
+ /// The number to take the square root of.
+ /// The square root of
+ public static float Sqrt(float x) => (float)Math.Sqrt(x);
+
+ ///
+ /// Returns the tangent of the specified angle.
+ ///
+ /// The angle to take the tangent of.
+ /// The tangent of
+ public static float Tan(float x) => (float)Math.Tan(x);
+
+ ///
+ /// Returns the hyperbolic tangent of the specified angle.
+ ///
+ /// The angle to take the hyperbolic tangent of.
+ /// The hyperbolic tangent of
+ public static float Tanh(float x) => (float)Math.Tanh(x);
+
+ ///
+ /// Calculates the integral part of a specified single-precision floating-point number.
+ ///
+ /// The number to truncate.
+ /// The truncated representation of
+ public static float Truncate(float x) => (float)Math.Truncate(x);
+ }
+}
diff --git a/src/libraries/Microsoft.Bcl.Numerics/src/System/Microsoft.Bcl.Numerics.Forwards.cs b/src/libraries/Microsoft.Bcl.Numerics/src/System/Microsoft.Bcl.Numerics.Forwards.cs
new file mode 100644
index 00000000000000..641ce5525675f4
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/src/System/Microsoft.Bcl.Numerics.Forwards.cs
@@ -0,0 +1,4 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MathF))]
diff --git a/src/libraries/Microsoft.Bcl.Numerics/tests/MathF.cs b/src/libraries/Microsoft.Bcl.Numerics/tests/MathF.cs
new file mode 100644
index 00000000000000..3aa148a2161564
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/tests/MathF.cs
@@ -0,0 +1,1169 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Xunit;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+#pragma warning disable xUnit1025 // reporting duplicate test cases due to not distinguishing 0.0 from -0.0
+
+namespace System.Tests
+{
+ public static class MathFTests
+ {
+ // binary32 (float) has a machine epsilon of 2^-23 (approx. 1.19e-07). However, this
+ // is slightly too accurate when writing tests meant to run against libm implementations
+ // for various platforms. 2^-21 (approx. 4.76e-07) seems to be as accurate as we can get.
+ //
+ // The tests themselves will take CrossPlatformMachineEpsilon and adjust it according to the expected result
+ // so that the delta used for comparison will compare the most significant digits and ignore
+ // any digits that are outside the single precision range (6-9 digits).
+
+ // For example, a test with an expect result in the format of 0.xxxxxxxxx will use
+ // CrossPlatformMachineEpsilon for the variance, while an expected result in the format of 0.0xxxxxxxxx
+ // will use CrossPlatformMachineEpsilon / 10 and expected result in the format of x.xxxxxx will
+ // use CrossPlatformMachineEpsilon * 10.
+ private const float CrossPlatformMachineEpsilon = 4.76837158e-07f;
+
+ // The existing estimate functions either have an error of no more than 1.5 * 2^-12 (approx. 3.66e-04)
+ // or perform one Newton-Raphson iteration which, for the currently tested values, gives an error of
+ // no more than approx. 1.5 * 2^-7 (approx 1.17e-02).
+ private const double CrossPlatformMachineEpsilonForEstimates = 1.171875e-02f;
+
+ [Fact]
+ public static void E()
+ {
+ Assert.Equal(2.71828183f, MathF.E);
+ }
+
+ [Fact]
+ public static void Pi()
+ {
+ Assert.Equal(3.14159265f, MathF.PI);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(-3.14159265f, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // value: -(pi) expected: (pi)
+ [InlineData(-2.71828183f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // value: -(e) expected: (e)
+ [InlineData(-2.30258509f, 2.30258509f, CrossPlatformMachineEpsilon * 10)] // value: -(ln(10)) expected: (ln(10))
+ [InlineData(-1.57079633f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // value: -(pi / 2) expected: (pi / 2)
+ [InlineData(-1.44269504f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // value: -(log2(e)) expected: (log2(e))
+ [InlineData(-1.41421356f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // value: -(sqrt(2)) expected: (sqrt(2))
+ [InlineData(-1.12837917f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // value: -(2 / sqrt(pi)) expected: (2 / sqrt(pi))
+ [InlineData(-1.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.785398163f, 0.785398163f, CrossPlatformMachineEpsilon)] // value: -(pi / 4) expected: (pi / 4)
+ [InlineData(-0.707106781f, 0.707106781f, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2)) expected: (1 / sqrt(2))
+ [InlineData(-0.693147181f, 0.693147181f, CrossPlatformMachineEpsilon)] // value: -(ln(2)) expected: (ln(2))
+ [InlineData(-0.636619772f, 0.636619772f, CrossPlatformMachineEpsilon)] // value: -(2 / pi) expected: (2 / pi)
+ [InlineData(-0.434294482f, 0.434294482f, CrossPlatformMachineEpsilon)] // value: -(log10(e)) expected: (log10(e))
+ [InlineData(-0.318309886f, 0.318309886f, CrossPlatformMachineEpsilon)] // value: -(1 / pi) expected: (1 / pi)
+ [InlineData(-0.0f, 0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 0.318309886f, CrossPlatformMachineEpsilon)] // value: (1 / pi) expected: (1 / pi)
+ [InlineData(0.434294482f, 0.434294482f, CrossPlatformMachineEpsilon)] // value: (log10(e)) expected: (log10(e))
+ [InlineData(0.636619772f, 0.636619772f, CrossPlatformMachineEpsilon)] // value: (2 / pi) expected: (2 / pi)
+ [InlineData(0.693147181f, 0.693147181f, CrossPlatformMachineEpsilon)] // value: (ln(2)) expected: (ln(2))
+ [InlineData(0.707106781f, 0.707106781f, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2)) expected: (1 / sqrt(2))
+ [InlineData(0.785398163f, 0.785398163f, CrossPlatformMachineEpsilon)] // value: (pi / 4) expected: (pi / 4)
+ [InlineData(1.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.12837917f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi)) expected: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2)) expected: (sqrt(2))
+ [InlineData(1.44269504f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // value: (log2(e)) expected: (log2(e))
+ [InlineData(1.57079633f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2) expected: (pi / 2)
+ [InlineData(2.30258509f, 2.30258509f, CrossPlatformMachineEpsilon * 10)] // value: (ln(10)) expected: (ln(10))
+ [InlineData(2.71828183f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // value: (e) expected: (e)
+ [InlineData(3.14159265f, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // value: (pi) expected: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Abs(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Abs(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, float.NaN, 0.0f)] // value: -(pi)
+ [InlineData(-2.71828183f, float.NaN, 0.0f)] // value: -(e)
+ [InlineData(-1.41421356f, float.NaN, 0.0f)] // value: -(sqrt(2))
+ [InlineData(-1.0f, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: (pi)
+ [InlineData(-0.911733915f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: (e)
+ [InlineData(-0.668201510f, 2.30258509f, CrossPlatformMachineEpsilon * 10)] // expected: (ln(10))
+ [InlineData(-0.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(0.127751218f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e))
+ [InlineData(0.155943695f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2))
+ [InlineData(0.428125148f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi))
+ [InlineData(0.540302306f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.707106781f, 0.785398163f, CrossPlatformMachineEpsilon)] // expected: (pi / 4), value: (1 / sqrt(2))
+ [InlineData(0.760244597f, 0.707106781f, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2))
+ [InlineData(0.769238901f, 0.693147181f, CrossPlatformMachineEpsilon)] // expected: (ln(2))
+ [InlineData(0.804109828f, 0.636619772f, CrossPlatformMachineEpsilon)] // expected: (2 / pi)
+ [InlineData(0.907167129f, 0.434294482f, CrossPlatformMachineEpsilon)] // expected: (log10(e))
+ [InlineData(0.949765715f, 0.318309886f, CrossPlatformMachineEpsilon)] // expected: (1 / pi)
+ [InlineData(1.0f, 0.0f, 0.0f)]
+ [InlineData(1.41421356f, float.NaN, 0.0f)] // value: (sqrt(2))
+ [InlineData(2.71828183f, float.NaN, 0.0f)] // value: (e)
+ [InlineData(3.14159265f, float.NaN, 0.0f)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.NaN, 0.0f)]
+ public static void Acos(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Acos(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, float.NaN, 0.0f)] // value: -(pi)
+ [InlineData(-2.71828183f, float.NaN, 0.0f)] // value: -(e)
+ [InlineData(-1.41421356f, float.NaN, 0.0f)] // value: -(sqrt(2))
+ [InlineData(-1.0f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(-0.991806244f, -1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: -(log2(e))
+ [InlineData(-0.987765946f, -1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: -(sqrt(2))
+ [InlineData(-0.903719457f, -1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: -(2 / sqrt(pi))
+ [InlineData(-0.841470985f, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.743980337f, -0.839007561f, CrossPlatformMachineEpsilon)] // expected: -(pi - ln(10))
+ [InlineData(-0.707106781f, -0.785398163f, CrossPlatformMachineEpsilon)] // expected: -(pi / 4), value: (1 / sqrt(2))
+ [InlineData(-0.649636939f, -0.707106781f, CrossPlatformMachineEpsilon)] // expected: -(1 / sqrt(2))
+ [InlineData(-0.638961276f, -0.693147181f, CrossPlatformMachineEpsilon)] // expected: -(ln(2))
+ [InlineData(-0.594480769f, -0.636619772f, CrossPlatformMachineEpsilon)] // expected: -(2 / pi)
+ [InlineData(-0.420770483f, -0.434294482f, CrossPlatformMachineEpsilon)] // expected: -(log10(e))
+ [InlineData(-0.410781291f, -0.423310825f, CrossPlatformMachineEpsilon)] // expected: -(pi - e)
+ [InlineData(-0.312961796f, -0.318309886f, CrossPlatformMachineEpsilon)] // expected: -(1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.312961796f, 0.318309886f, CrossPlatformMachineEpsilon)] // expected: (1 / pi)
+ [InlineData(0.410781291f, 0.423310825f, CrossPlatformMachineEpsilon)] // expected: (pi - e)
+ [InlineData(0.420770483f, 0.434294482f, CrossPlatformMachineEpsilon)] // expected: (log10(e))
+ [InlineData(0.594480769f, 0.636619772f, CrossPlatformMachineEpsilon)] // expected: (2 / pi)
+ [InlineData(0.638961276f, 0.693147181f, CrossPlatformMachineEpsilon)] // expected: (ln(2))
+ [InlineData(0.649636939f, 0.707106781f, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2))
+ [InlineData(0.707106781f, 0.785398163f, CrossPlatformMachineEpsilon)] // expected: (pi / 4), value: (1 / sqrt(2))
+ [InlineData(0.743980337f, 0.839007561f, CrossPlatformMachineEpsilon)] // expected: (pi - ln(10))
+ [InlineData(0.841470985f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.903719457f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi))
+ [InlineData(0.987765946f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2))
+ [InlineData(0.991806244f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e))
+ [InlineData(1.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(1.41421356f, float.NaN, 0.0f)] // value: (sqrt(2))
+ [InlineData(2.71828183f, float.NaN, 0.0f)] // value: (e)
+ [InlineData(3.14159265f, float.NaN, 0.0f)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.NaN, 0.0f)]
+ public static void Asin(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Asin(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(-7.76357567f, -1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: -(log2(e))
+ [InlineData(-6.33411917f, -1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: -(sqrt(2))
+ [InlineData(-2.11087684f, -1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: -(2 / sqrt(pi))
+ [InlineData(-1.55740772f, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-1.11340715f, -0.839007561f, CrossPlatformMachineEpsilon)] // expected: -(pi - ln(10))
+ [InlineData(-1.0f, -0.785398163f, CrossPlatformMachineEpsilon)] // expected: -(pi / 4)
+ [InlineData(-0.854510432f, -0.707106781f, CrossPlatformMachineEpsilon)] // expected: -(1 / sqrt(2))
+ [InlineData(-0.830640878f, -0.693147181f, CrossPlatformMachineEpsilon)] // expected: -(ln(2))
+ [InlineData(-0.739302950f, -0.636619772f, CrossPlatformMachineEpsilon)] // expected: -(2 / pi)
+ [InlineData(-0.463829067f, -0.434294482f, CrossPlatformMachineEpsilon)] // expected: -(log10(e))
+ [InlineData(-0.450549534f, -0.423310825f, CrossPlatformMachineEpsilon)] // expected: -(pi - e)
+ [InlineData(-0.329514733f, -0.318309886f, CrossPlatformMachineEpsilon)] // expected: -(1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.329514733f, 0.318309886f, CrossPlatformMachineEpsilon)] // expected: (1 / pi)
+ [InlineData(0.450549534f, 0.423310825f, CrossPlatformMachineEpsilon)] // expected: (pi - e)
+ [InlineData(0.463829067f, 0.434294482f, CrossPlatformMachineEpsilon)] // expected: (log10(e))
+ [InlineData(0.739302950f, 0.636619772f, CrossPlatformMachineEpsilon)] // expected: (2 / pi)
+ [InlineData(0.830640878f, 0.693147181f, CrossPlatformMachineEpsilon)] // expected: (ln(2))
+ [InlineData(0.854510432f, 0.707106781f, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2))
+ [InlineData(1.0f, 0.785398163f, CrossPlatformMachineEpsilon)] // expected: (pi / 4)
+ [InlineData(1.11340715f, 0.839007561f, CrossPlatformMachineEpsilon)] // expected: (pi - ln(10))
+ [InlineData(1.55740772f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(2.11087684f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi))
+ [InlineData(6.33411917f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2))
+ [InlineData(7.76357567f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e))
+ [InlineData(float.PositiveInfinity, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ public static void Atan(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Atan(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, -1.0f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(float.NegativeInfinity, -0.0f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(float.NegativeInfinity, float.NaN, float.NaN, 0.0f)]
+ [InlineData(float.NegativeInfinity, 0.0f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(float.NegativeInfinity, 1.0f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(-1.0f, -1.0f, -2.35619449f, CrossPlatformMachineEpsilon * 10)] // expected: -(3 * pi / 4)
+ [InlineData(-1.0f, -0.0f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(-1.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(-1.0f, 0.0f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(-1.0f, 1.0f, -0.785398163f, CrossPlatformMachineEpsilon)] // expected: -(pi / 4)
+ [InlineData(-1.0f, float.PositiveInfinity, -0.0f, 0.0f)]
+ [InlineData(-0.991806244f, -0.127751218f, -1.69889761f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - log2(e))
+ [InlineData(-0.991806244f, 0.127751218f, -1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: -(log2(e))
+ [InlineData(-0.987765946f, -0.155943695f, -1.72737909f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - sqrt(2))
+ [InlineData(-0.987765946f, 0.155943695f, -1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: -(sqrt(2))
+ [InlineData(-0.903719457f, -0.428125148f, -2.01321349f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - (2 / sqrt(pi))
+ [InlineData(-0.903719457f, 0.428125148f, -1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: -(2 / sqrt(pi)
+ [InlineData(-0.841470985f, -0.540302306f, -2.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - 1)
+ [InlineData(-0.841470985f, 0.540302306f, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.743980337f, -0.668201510f, -2.30258509f, CrossPlatformMachineEpsilon * 10)] // expected: -(ln(10))
+ [InlineData(-0.743980337f, 0.668201510f, -0.839007561f, CrossPlatformMachineEpsilon)] // expected: -(pi - ln(10))
+ [InlineData(-0.707106781f, -0.707106781f, -2.35619449f, CrossPlatformMachineEpsilon * 10)] // expected: -(3 * pi / 4), y: -(1 / sqrt(2)) x: -(1 / sqrt(2))
+ [InlineData(-0.707106781f, 0.707106781f, -0.785398163f, CrossPlatformMachineEpsilon)] // expected: -(pi / 4), y: -(1 / sqrt(2)) x: (1 / sqrt(2))
+ [InlineData(-0.649636939f, -0.760244597f, -2.43448587f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - (1 / sqrt(2))
+ [InlineData(-0.649636939f, 0.760244597f, -0.707106781f, CrossPlatformMachineEpsilon)] // expected: -(1 / sqrt(2))
+ [InlineData(-0.638961276f, -0.769238901f, -2.44844547f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - ln(2))
+ [InlineData(-0.638961276f, 0.769238901f, -0.693147181f, CrossPlatformMachineEpsilon)] // expected: -(ln(2))
+ [InlineData(-0.594480769f, -0.804109828f, -2.50497288f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - (2 / pi))
+ [InlineData(-0.594480769f, 0.804109828f, -0.636619772f, CrossPlatformMachineEpsilon)] // expected: -(2 / pi)
+ [InlineData(-0.420770483f, -0.907167129f, -2.70729817f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - log10(e))
+ [InlineData(-0.420770483f, 0.907167129f, -0.434294482f, CrossPlatformMachineEpsilon)] // expected: -(log10(e))
+ [InlineData(-0.410781291f, -0.911733915f, -2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: -(e)
+ [InlineData(-0.410781291f, 0.911733915f, -0.423310825f, CrossPlatformMachineEpsilon)] // expected: -(pi - e)
+ [InlineData(-0.312961796f, -0.949765715f, -2.82328277f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi - (1 / pi))
+ [InlineData(-0.312961796f, 0.949765715f, -0.318309886f, CrossPlatformMachineEpsilon)] // expected: -(1 / pi)
+ [InlineData(-0.0f, float.NegativeInfinity, -3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi)
+ [InlineData(-0.0f, -1.0f, -3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi)
+ [InlineData(-0.0f, -0.0f, -3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi)
+ [InlineData(-0.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(-0.0f, 0.0f, -0.0f, 0.0f)]
+ [InlineData(-0.0f, 1.0f, -0.0f, 0.0f)]
+ [InlineData(-0.0f, float.PositiveInfinity, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(float.NaN, -1.0f, float.NaN, 0.0f)]
+ [InlineData(float.NaN, -0.0f, float.NaN, 0.0f)]
+ [InlineData(float.NaN, float.NaN, float.NaN, 0.0f)]
+ [InlineData(float.NaN, 0.0f, float.NaN, 0.0f)]
+ [InlineData(float.NaN, 1.0f, float.NaN, 0.0f)]
+ [InlineData(float.NaN, float.PositiveInfinity, float.NaN, 0.0f)]
+ [InlineData(0.0f, float.NegativeInfinity, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: (pi)
+ [InlineData(0.0f, -1.0f, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: (pi)
+ [InlineData(0.0f, -0.0f, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: (pi)
+ [InlineData(0.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f, 0.0f)]
+ [InlineData(0.0f, 1.0f, 0.0f, 0.0f)]
+ [InlineData(0.0f, float.PositiveInfinity, 0.0f, 0.0f)]
+ [InlineData(0.312961796f, -0.949765715f, 2.82328277f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - (1 / pi))
+ [InlineData(0.312961796f, 0.949765715f, 0.318309886f, CrossPlatformMachineEpsilon)] // expected: (1 / pi)
+ [InlineData(0.410781291f, -0.911733915f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: (e)
+ [InlineData(0.410781291f, 0.911733915f, 0.423310825f, CrossPlatformMachineEpsilon)] // expected: (pi - e)
+ [InlineData(0.420770483f, -0.907167129f, 2.70729817f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - log10(e))
+ [InlineData(0.420770483f, 0.907167129f, 0.434294482f, CrossPlatformMachineEpsilon)] // expected: (log10(e))
+ [InlineData(0.594480769f, -0.804109828f, 2.50497288f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - (2 / pi))
+ [InlineData(0.594480769f, 0.804109828f, 0.636619772f, CrossPlatformMachineEpsilon)] // expected: (2 / pi)
+ [InlineData(0.638961276f, -0.769238901f, 2.44844547f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - ln(2))
+ [InlineData(0.638961276f, 0.769238901f, 0.693147181f, CrossPlatformMachineEpsilon)] // expected: (ln(2))
+ [InlineData(0.649636939f, -0.760244597f, 2.43448587f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - (1 / sqrt(2))
+ [InlineData(0.649636939f, 0.760244597f, 0.707106781f, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2))
+ [InlineData(0.707106781f, -0.707106781f, 2.35619449f, CrossPlatformMachineEpsilon * 10)] // expected: (3 * pi / 4), y: (1 / sqrt(2)) x: -(1 / sqrt(2))
+ [InlineData(0.707106781f, 0.707106781f, 0.785398163f, CrossPlatformMachineEpsilon)] // expected: (pi / 4), y: (1 / sqrt(2)) x: (1 / sqrt(2))
+ [InlineData(0.743980337f, -0.668201510f, 2.30258509f, CrossPlatformMachineEpsilon * 10)] // expected: (ln(10))
+ [InlineData(0.743980337f, 0.668201510f, 0.839007561f, CrossPlatformMachineEpsilon)] // expected: (pi - ln(10))
+ [InlineData(0.841470985f, -0.540302306f, 2.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - 1)
+ [InlineData(0.841470985f, 0.540302306f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.903719457f, -0.428125148f, 2.01321349f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - (2 / sqrt(pi))
+ [InlineData(0.903719457f, 0.428125148f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi))
+ [InlineData(0.987765946f, -0.155943695f, 1.72737909f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - sqrt(2))
+ [InlineData(0.987765946f, 0.155943695f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2))
+ [InlineData(0.991806244f, -0.127751218f, 1.69889761f, CrossPlatformMachineEpsilon * 10)] // expected: (pi - log2(e))
+ [InlineData(0.991806244f, 0.127751218f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e))
+ [InlineData(1.0f, -1.0f, 2.35619449f, CrossPlatformMachineEpsilon * 10)] // expected: (3 * pi / 4)
+ [InlineData(1.0f, -0.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(1.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(1.0f, 0.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(1.0f, 1.0f, 0.785398163f, CrossPlatformMachineEpsilon)] // expected: (pi / 4)
+ [InlineData(1.0f, float.PositiveInfinity, 0.0f, 0.0f)]
+ [InlineData(float.PositiveInfinity, -1.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(float.PositiveInfinity, -0.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(float.PositiveInfinity, float.NaN, float.NaN, 0.0f)]
+ [InlineData(float.PositiveInfinity, 0.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(float.PositiveInfinity, 1.0f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ public static void Atan2(float y, float x, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Atan2(y, x), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NegativeInfinity, 0.0f)]
+ [InlineData(-3.14159265f, -3.0f, 0.0f)] // value: -(pi)
+ [InlineData(-2.71828183f, -2.0f, 0.0f)] // value: -(e)
+ [InlineData(-2.30258509f, -2.0f, 0.0f)] // value: -(ln(10))
+ [InlineData(-1.57079633f, -1.0f, 0.0f)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, -1.0f, 0.0f)] // value: -(log2(e))
+ [InlineData(-1.41421356f, -1.0f, 0.0f)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, -1.0f, 0.0f)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, -1.0f, 0.0f)]
+#if NETFRAMEWORK
+ [InlineData(-0.785398163f, 0.0f, 0.0f)] // value: (pi / 4)
+ [InlineData(-0.707106781f, 0.0f, 0.0f)] // value: (1 / sqrt(2))
+ [InlineData(-0.693147181f, 0.0f, 0.0f)] // value: (ln(2))
+ [InlineData(-0.636619772f, 0.0f, 0.0f)] // value: (2 / pi)
+ [InlineData(-0.434294482f, 0.0f, 0.0f)] // value: (log10(e))
+ [InlineData(-0.318309886f, 0.0f, 0.0f)] // value: (1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+#else
+ [InlineData(-0.785398163f, -0.0f, 0.0f)] // value: (pi / 4)
+ [InlineData(-0.707106781f, -0.0f, 0.0f)] // value: (1 / sqrt(2))
+ [InlineData(-0.693147181f, -0.0f, 0.0f)] // value: (ln(2))
+ [InlineData(-0.636619772f, -0.0f, 0.0f)] // value: (2 / pi)
+ [InlineData(-0.434294482f, -0.0f, 0.0f)] // value: (log10(e))
+ [InlineData(-0.318309886f, -0.0f, 0.0f)] // value: (1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+#endif
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 1.0f, 0.0f)] // value: (1 / pi)
+ [InlineData(0.434294482f, 1.0f, 0.0f)] // value: (log10(e))
+ [InlineData(0.636619772f, 1.0f, 0.0f)] // value: (2 / pi)
+ [InlineData(0.693147181f, 1.0f, 0.0f)] // value: (ln(2))
+ [InlineData(0.707106781f, 1.0f, 0.0f)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 1.0f, 0.0f)] // value: (pi / 4)
+ [InlineData(1.0f, 1.0f, 0.0f)]
+ [InlineData(1.12837917f, 2.0f, 0.0f)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 2.0f, 0.0f)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 2.0f, 0.0f)] // value: (log2(e))
+ [InlineData(1.57079633f, 2.0f, 0.0f)] // value: (pi / 2)
+ [InlineData(2.30258509f, 3.0f, 0.0f)] // value: (ln(10))
+ [InlineData(2.71828183f, 3.0f, 0.0f)] // value: (e)
+ [InlineData(3.14159265f, 4.0f, 0.0f)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Ceiling(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Ceiling(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, -1.0f, CrossPlatformMachineEpsilon * 10)] // value: -(pi)
+ [InlineData(-2.71828183f, -0.911733918f, CrossPlatformMachineEpsilon)] // value: -(e)
+ [InlineData(-2.30258509f, -0.668201510f, CrossPlatformMachineEpsilon)] // value: -(ln(10))
+ [InlineData(-1.57079633f, 0.0f, CrossPlatformMachineEpsilon)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, 0.127751218f, CrossPlatformMachineEpsilon)] // value: -(log2(e))
+ [InlineData(-1.41421356f, 0.155943695f, CrossPlatformMachineEpsilon)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, 0.428125148f, CrossPlatformMachineEpsilon)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, 0.540302306f, CrossPlatformMachineEpsilon)]
+ [InlineData(-0.785398163f, 0.707106781f, CrossPlatformMachineEpsilon)] // value: -(pi / 4), expected: (1 / sqrt(2))
+ [InlineData(-0.707106781f, 0.760244597f, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2))
+ [InlineData(-0.693147181f, 0.769238901f, CrossPlatformMachineEpsilon)] // value: -(ln(2))
+ [InlineData(-0.636619772f, 0.804109828f, CrossPlatformMachineEpsilon)] // value: -(2 / pi)
+ [InlineData(-0.434294482f, 0.907167129f, CrossPlatformMachineEpsilon)] // value: -(log10(e))
+ [InlineData(-0.318309886f, 0.949765715f, CrossPlatformMachineEpsilon)] // value: -(1 / pi)
+ [InlineData(-0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.318309886f, 0.949765715f, CrossPlatformMachineEpsilon)] // value: (1 / pi)
+ [InlineData(0.434294482f, 0.907167129f, CrossPlatformMachineEpsilon)] // value: (log10(e))
+ [InlineData(0.636619772f, 0.804109828f, CrossPlatformMachineEpsilon)] // value: (2 / pi)
+ [InlineData(0.693147181f, 0.769238901f, CrossPlatformMachineEpsilon)] // value: (ln(2))
+ [InlineData(0.707106781f, 0.760244597f, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 0.707106781f, CrossPlatformMachineEpsilon)] // value: (pi / 4), expected: (1 / sqrt(2))
+ [InlineData(1.0f, 0.540302306f, CrossPlatformMachineEpsilon)]
+ [InlineData(1.12837917f, 0.428125148f, CrossPlatformMachineEpsilon)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 0.155943695f, CrossPlatformMachineEpsilon)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 0.127751218f, CrossPlatformMachineEpsilon)] // value: (log2(e))
+ [InlineData(1.57079633f, 0.0f, CrossPlatformMachineEpsilon)] // value: (pi / 2)
+ [InlineData(2.30258509f, -0.668201510f, CrossPlatformMachineEpsilon)] // value: (ln(10))
+ [InlineData(2.71828183f, -0.911733918f, CrossPlatformMachineEpsilon)] // value: (e)
+ [InlineData(3.14159265f, -1.0f, CrossPlatformMachineEpsilon * 10)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.NaN, 0.0f)]
+ public static void Cos(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Cos(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(-3.14159265f, 11.5919533f, CrossPlatformMachineEpsilon * 100)] // value: (pi)
+ [InlineData(-2.71828183f, 7.61012514f, CrossPlatformMachineEpsilon * 10)] // value: (e)
+ [InlineData(-2.30258509f, 5.05f, CrossPlatformMachineEpsilon * 10)] // value: (ln(10))
+ [InlineData(-1.57079633f, 2.50917848f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2)
+ [InlineData(-1.44269504f, 2.23418810f, CrossPlatformMachineEpsilon * 10)] // value: (log2(e))
+ [InlineData(-1.41421356f, 2.17818356f, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2))
+ [InlineData(-1.12837917f, 1.70710014f, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi))
+ [InlineData(-1.0f, 1.54308063f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.785398163f, 1.32460909f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 4)
+ [InlineData(-0.707106781f, 1.26059184f, CrossPlatformMachineEpsilon * 10)] // value: (1 / sqrt(2))
+ [InlineData(-0.693147181f, 1.25f, CrossPlatformMachineEpsilon * 10)] // value: (ln(2))
+ [InlineData(-0.636619772f, 1.20957949f, CrossPlatformMachineEpsilon * 10)] // value: (2 / pi)
+ [InlineData(-0.434294482f, 1.09579746f, CrossPlatformMachineEpsilon * 10)] // value: (log10(e))
+ [InlineData(-0.318309886f, 1.05108979f, CrossPlatformMachineEpsilon * 10)] // value: (1 / pi)
+ [InlineData(-0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.318309886f, 1.05108979f, CrossPlatformMachineEpsilon * 10)] // value: (1 / pi)
+ [InlineData(0.434294482f, 1.09579746f, CrossPlatformMachineEpsilon * 10)] // value: (log10(e))
+ [InlineData(0.636619772f, 1.20957949f, CrossPlatformMachineEpsilon * 10)] // value: (2 / pi)
+ [InlineData(0.693147181f, 1.25f, CrossPlatformMachineEpsilon * 10)] // value: (ln(2))
+ [InlineData(0.707106781f, 1.26059184f, CrossPlatformMachineEpsilon * 10)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 1.32460909f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 4)
+ [InlineData(1.0f, 1.54308063f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.12837917f, 1.70710014f, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 2.17818356f, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 2.23418810f, CrossPlatformMachineEpsilon * 10)] // value: (log2(e))
+ [InlineData(1.57079633f, 2.50917848f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2)
+ [InlineData(2.30258509f, 5.05f, CrossPlatformMachineEpsilon * 10)] // value: (ln(10))
+ [InlineData(2.71828183f, 7.61012514f, CrossPlatformMachineEpsilon * 10)] // value: (e)
+ [InlineData(3.14159265f, 11.5919533f, CrossPlatformMachineEpsilon * 100)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Cosh(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Cosh(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, 0.0f, CrossPlatformMachineEpsilon)]
+ [InlineData(-3.14159265f, 0.0432139183f, CrossPlatformMachineEpsilon / 10)] // value: -(pi)
+ [InlineData(-2.71828183f, 0.0659880358f, CrossPlatformMachineEpsilon / 10)] // value: -(e)
+ [InlineData(-2.30258509f, 0.1f, CrossPlatformMachineEpsilon)] // value: -(ln(10))
+ [InlineData(-1.57079633f, 0.207879576f, CrossPlatformMachineEpsilon)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, 0.236290088f, CrossPlatformMachineEpsilon)] // value: -(log2(e))
+ [InlineData(-1.41421356f, 0.243116734f, CrossPlatformMachineEpsilon)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, 0.323557264f, CrossPlatformMachineEpsilon)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, 0.367879441f, CrossPlatformMachineEpsilon)]
+ [InlineData(-0.785398163f, 0.455938128f, CrossPlatformMachineEpsilon)] // value: -(pi / 4)
+ [InlineData(-0.707106781f, 0.493068691f, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2))
+ [InlineData(-0.693147181f, 0.5f, CrossPlatformMachineEpsilon)] // value: -(ln(2))
+ [InlineData(-0.636619772f, 0.529077808f, CrossPlatformMachineEpsilon)] // value: -(2 / pi)
+ [InlineData(-0.434294482f, 0.647721485f, CrossPlatformMachineEpsilon)] // value: -(log10(e))
+ [InlineData(-0.318309886f, 0.727377349f, CrossPlatformMachineEpsilon)] // value: -(1 / pi)
+ [InlineData(-0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.318309886f, 1.37480223f, CrossPlatformMachineEpsilon * 10)] // value: (1 / pi)
+ [InlineData(0.434294482f, 1.54387344f, CrossPlatformMachineEpsilon * 10)] // value: (log10(e))
+ [InlineData(0.636619772f, 1.89008116f, CrossPlatformMachineEpsilon * 10)] // value: (2 / pi)
+ [InlineData(0.693147181f, 2.0f, CrossPlatformMachineEpsilon * 10)] // value: (ln(2))
+ [InlineData(0.707106781f, 2.02811498f, CrossPlatformMachineEpsilon * 10)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 2.19328005f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 4)
+ [InlineData(1.0f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: (e)
+ [InlineData(1.12837917f, 3.09064302f, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 4.11325038f, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 4.23208611f, CrossPlatformMachineEpsilon * 10)] // value: (log2(e))
+ [InlineData(1.57079633f, 4.81047738f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2)
+ [InlineData(2.30258509f, 10.0f, CrossPlatformMachineEpsilon * 100)] // value: (ln(10))
+ [InlineData(2.71828183f, 15.1542622f, CrossPlatformMachineEpsilon * 100)] // value: (e)
+ [InlineData(3.14159265f, 23.1406926f, CrossPlatformMachineEpsilon * 100)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Exp(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Exp(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NegativeInfinity, 0.0f)]
+ [InlineData(-3.14159265f, -4.0f, 0.0f)] // value: -(pi)
+ [InlineData(-2.71828183f, -3.0f, 0.0f)] // value: -(e)
+ [InlineData(-2.30258509f, -3.0f, 0.0f)] // value: -(ln(10))
+ [InlineData(-1.57079633f, -2.0f, 0.0f)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, -2.0f, 0.0f)] // value: -(log2(e))
+ [InlineData(-1.41421356f, -2.0f, 0.0f)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, -2.0f, 0.0f)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, -1.0f, 0.0f)]
+ [InlineData(-0.785398163f, -1.0f, 0.0f)] // value: -(pi / 4)
+ [InlineData(-0.707106781f, -1.0f, 0.0f)] // value: -(1 / sqrt(2))
+ [InlineData(-0.693147181f, -1.0f, 0.0f)] // value: -(ln(2))
+ [InlineData(-0.636619772f, -1.0f, 0.0f)] // value: -(2 / pi)
+ [InlineData(-0.434294482f, -1.0f, 0.0f)] // value: -(log10(e))
+ [InlineData(-0.318309886f, -1.0f, 0.0f)] // value: -(1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 0.0f, 0.0f)] // value: (1 / pi)
+ [InlineData(0.434294482f, 0.0f, 0.0f)] // value: (log10(e))
+ [InlineData(0.636619772f, 0.0f, 0.0f)] // value: (2 / pi)
+ [InlineData(0.693147181f, 0.0f, 0.0f)] // value: (ln(2))
+ [InlineData(0.707106781f, 0.0f, 0.0f)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 0.0f, 0.0f)] // value: (pi / 4)
+ [InlineData(1.0f, 1.0f, 0.0f)]
+ [InlineData(1.12837917f, 1.0f, 0.0f)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 1.0f, 0.0f)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 1.0f, 0.0f)] // value: (log2(e))
+ [InlineData(1.57079633f, 1.0f, 0.0f)] // value: (pi / 2)
+ [InlineData(2.30258509f, 2.0f, 0.0f)] // value: (ln(10))
+ [InlineData(2.71828183f, 2.0f, 0.0f)] // value: (e)
+ [InlineData(3.14159265f, 3.0f, 0.0f)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Floor(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Floor(value), allowedVariance);
+ }
+
+ [Fact]
+ public static void IEEERemainder()
+ {
+ Assert.Equal(-1.0f, MathF.IEEERemainder(3.0f, 2.0f));
+ Assert.Equal(0.0f, MathF.IEEERemainder(4.0f, 2.0f));
+ Assert.Equal(1.0f, MathF.IEEERemainder(10.0f, 3.0f));
+ Assert.Equal(-1.0f, MathF.IEEERemainder(11.0f, 3.0f));
+ Assert.Equal(-2.0f, MathF.IEEERemainder(28.0f, 5.0f));
+ AssertExtensions.Equal(1.8f, MathF.IEEERemainder(17.8f, 4.0f), CrossPlatformMachineEpsilon * 10);
+ AssertExtensions.Equal(1.4f, MathF.IEEERemainder(17.8f, 4.1f), CrossPlatformMachineEpsilon * 10);
+ AssertExtensions.Equal(0.1000004f, MathF.IEEERemainder(-16.3f, 4.1f), CrossPlatformMachineEpsilon / 10);
+ AssertExtensions.Equal(1.4f, MathF.IEEERemainder(17.8f, -4.1f), CrossPlatformMachineEpsilon * 10);
+ AssertExtensions.Equal(-1.4f, MathF.IEEERemainder(-17.8f, -4.1f), CrossPlatformMachineEpsilon * 10);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, float.NaN, 0.0f)] // value: -(pi)
+ [InlineData(-2.71828183f, float.NaN, 0.0f)] // value: -(e)
+ [InlineData(-1.41421356f, float.NaN, 0.0f)] // value: -(sqrt(2))
+ [InlineData(-1.0f, float.NaN, 0.0f)]
+ [InlineData(-0.693147181f, float.NaN, 0.0f)] // value: -(ln(2))
+ [InlineData(-0.434294482f, float.NaN, 0.0f)] // value: -(log10(e))
+ [InlineData(-0.0f, float.NegativeInfinity, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, float.NegativeInfinity, 0.0f)]
+ [InlineData(0.0432139183f, -3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi)
+ [InlineData(0.0659880358f, -2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: -(e)
+ [InlineData(0.1f, -2.30258509f, CrossPlatformMachineEpsilon * 10)] // expected: -(ln(10))
+ [InlineData(0.207879576f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(0.236290088f, -1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: -(log2(e))
+ [InlineData(0.243116734f, -1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: -(sqrt(2))
+ [InlineData(0.323557264f, -1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: -(2 / sqrt(pi))
+ [InlineData(0.367879441f, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.455938128f, -0.785398163f, CrossPlatformMachineEpsilon)] // expected: -(pi / 4)
+ [InlineData(0.493068691f, -0.707106781f, CrossPlatformMachineEpsilon)] // expected: -(1 / sqrt(2))
+ [InlineData(0.5f, -0.693147181f, CrossPlatformMachineEpsilon)] // expected: -(ln(2))
+ [InlineData(0.529077808f, -0.636619772f, CrossPlatformMachineEpsilon)] // expected: -(2 / pi)
+ [InlineData(0.647721485f, -0.434294482f, CrossPlatformMachineEpsilon)] // expected: -(log10(e))
+ [InlineData(0.727377349f, -0.318309886f, CrossPlatformMachineEpsilon)] // expected: -(1 / pi)
+ [InlineData(1.0f, 0.0f, 0.0f)]
+ [InlineData(1.37480223f, 0.318309886f, CrossPlatformMachineEpsilon)] // expected: (1 / pi)
+ [InlineData(1.54387344f, 0.434294482f, CrossPlatformMachineEpsilon)] // expected: (log10(e))
+ [InlineData(1.89008116f, 0.636619772f, CrossPlatformMachineEpsilon)] // expected: (2 / pi)
+ [InlineData(2.0f, 0.693147181f, CrossPlatformMachineEpsilon)] // expected: (ln(2))
+ [InlineData(2.02811498f, 0.707106781f, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2))
+ [InlineData(2.19328005f, 0.785398163f, CrossPlatformMachineEpsilon)] // expected: (pi / 4)
+ [InlineData(2.71828183f, 1.0f, CrossPlatformMachineEpsilon * 10)] // value: (e)
+ [InlineData(3.09064302f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi))
+ [InlineData(4.11325038f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2))
+ [InlineData(4.23208611f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e))
+ [InlineData(4.81047738f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(10.0f, 2.30258509f, CrossPlatformMachineEpsilon * 10)] // expected: (ln(10))
+ [InlineData(15.1542622f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: (e)
+ [InlineData(23.1406926f, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Log(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Log(value), allowedVariance);
+ }
+
+ [Fact]
+ public static void LogWithBase()
+ {
+ Assert.Equal(1.0f, MathF.Log(3.0f, 3.0f));
+ AssertExtensions.Equal(2.40217350f, MathF.Log(14.0f, 3.0f), CrossPlatformMachineEpsilon * 10);
+ Assert.Equal(float.NegativeInfinity, MathF.Log(0.0f, 3.0f));
+ Assert.Equal(float.NaN, MathF.Log(-3.0f, 3.0f));
+ Assert.Equal(float.NaN, MathF.Log(float.NaN, 3.0f));
+ Assert.Equal(float.PositiveInfinity, MathF.Log(float.PositiveInfinity, 3.0f));
+ Assert.Equal(float.NaN, MathF.Log(float.NegativeInfinity, 3.0f));
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, float.NaN, 0.0f)] // value: -(pi)
+ [InlineData(-2.71828183f, float.NaN, 0.0f)] // value: -(e)
+ [InlineData(-1.41421356f, float.NaN, 0.0f)] // value: -(sqrt(2))
+ [InlineData(-1.0f, float.NaN, 0.0f)]
+ [InlineData(-0.693147181f, float.NaN, 0.0f)] // value: -(ln(2))
+ [InlineData(-0.434294482f, float.NaN, 0.0f)] // value: -(log10(e))
+ [InlineData(-0.0f, float.NegativeInfinity, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, float.NegativeInfinity, 0.0f)]
+ [InlineData(0.000721784159f, -3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi)
+ [InlineData(0.00191301410f, -2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: -(e)
+ [InlineData(0.00498212830f, -2.30258509f, CrossPlatformMachineEpsilon * 10)] // expected: -(ln(10))
+ [InlineData(0.0268660410f, -1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2)
+ [InlineData(0.0360831928f, -1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: -(log2(e))
+ [InlineData(0.0385288847f, -1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: -(sqrt(2))
+ [InlineData(0.0744082059f, -1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: -(2 / sqrt(pi))
+ [InlineData(0.1f, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.163908636f, -0.785398163f, CrossPlatformMachineEpsilon)] // expected: -(pi / 4)
+ [InlineData(0.196287760f, -0.707106781f, CrossPlatformMachineEpsilon)] // expected: -(1 / sqrt(2))
+ [InlineData(0.202699566f, -0.693147181f, CrossPlatformMachineEpsilon)] // expected: -(ln(2))
+ [InlineData(0.230876765f, -0.636619772f, CrossPlatformMachineEpsilon)] // expected: -(2 / pi)
+ [InlineData(0.367879441f, -0.434294482f, CrossPlatformMachineEpsilon)] // expected: -(log10(e))
+ [InlineData(0.480496373f, -0.318309886f, CrossPlatformMachineEpsilon)] // expected: -(1 / pi)
+ [InlineData(1.0f, 0.0f, 0.0f)]
+ [InlineData(2.08118116f, 0.318309886f, CrossPlatformMachineEpsilon)] // expected: (1 / pi)
+ [InlineData(2.71828183f, 0.434294482f, CrossPlatformMachineEpsilon)] // expected: (log10(e)) value: (e)
+ [InlineData(4.33131503f, 0.636619772f, CrossPlatformMachineEpsilon)] // expected: (2 / pi)
+ [InlineData(4.93340967f, 0.693147181f, CrossPlatformMachineEpsilon)] // expected: (ln(2))
+ [InlineData(5.09456117f, 0.707106781f, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2))
+ [InlineData(6.10095980f, 0.785398163f, CrossPlatformMachineEpsilon)] // expected: (pi / 4)
+ [InlineData(10.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(13.4393779f, 1.12837917f, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi))
+ [InlineData(25.9545535f, 1.41421356f, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2))
+ [InlineData(27.7137338f, 1.44269504f, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e))
+ [InlineData(37.2217105f, 1.57079633f, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2)
+ [InlineData(200.717432f, 2.30258509f, CrossPlatformMachineEpsilon * 10)] // expected: (ln(10))
+ [InlineData(522.735300f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // expected: (e)
+ [InlineData(1385.45573f, 3.14159265f, CrossPlatformMachineEpsilon * 10)] // expected: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Log10(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Log10(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.PositiveInfinity, float.PositiveInfinity)]
+ [InlineData(float.PositiveInfinity, float.NegativeInfinity, float.PositiveInfinity)]
+ [InlineData(float.MinValue, float.MaxValue, float.MaxValue)]
+ [InlineData(float.MaxValue, float.MinValue, float.MaxValue)]
+ [InlineData(float.NaN, float.NaN, float.NaN)]
+ [InlineData(float.NaN, 1.0f, float.NaN)]
+ [InlineData(1.0f, float.NaN, float.NaN)]
+ [InlineData(float.PositiveInfinity, float.NaN, float.NaN)]
+ [InlineData(float.NegativeInfinity, float.NaN, float.NaN)]
+ [InlineData(float.NaN, float.PositiveInfinity, float.NaN)]
+ [InlineData(float.NaN, float.NegativeInfinity, float.NaN)]
+ [InlineData(-0.0f, 0.0f, 0.0f)]
+#if NETFRAMEWORK
+ [InlineData(0.0f, -0.0f, -0.0f)]
+#else
+ [InlineData(0.0f, -0.0f, 0.0f)]
+#endif
+ [InlineData(2.0f, -3.0f, 2.0f)]
+ [InlineData(-3.0f, 2.0f, 2.0f)]
+ [InlineData(3.0f, -2.0f, 3.0f)]
+ [InlineData(-2.0f, 3.0f, 3.0f)]
+ public static void Max(float x, float y, float expectedResult)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Max(x, y), 0.0f);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.PositiveInfinity, float.NegativeInfinity)]
+ [InlineData(float.PositiveInfinity, float.NegativeInfinity, float.NegativeInfinity)]
+ [InlineData(float.MinValue, float.MaxValue, float.MinValue)]
+ [InlineData(float.MaxValue, float.MinValue, float.MinValue)]
+ [InlineData(float.NaN, float.NaN, float.NaN)]
+ [InlineData(float.NaN, 1.0f, float.NaN)]
+ [InlineData(1.0f, float.NaN, float.NaN)]
+ [InlineData(float.PositiveInfinity, float.NaN, float.NaN)]
+ [InlineData(float.NegativeInfinity, float.NaN, float.NaN)]
+ [InlineData(float.NaN, float.PositiveInfinity, float.NaN)]
+ [InlineData(float.NaN, float.NegativeInfinity, float.NaN)]
+#if NETFRAMEWORK
+ [InlineData(-0.0f, 0.0f, 0.0f)]
+#else
+ [InlineData(-0.0f, 0.0f, -0.0f)]
+#endif
+ [InlineData(0.0f, -0.0f, -0.0f)]
+ [InlineData(2.0f, -3.0f, -3.0f)]
+ [InlineData(-3.0f, 2.0f, -3.0f)]
+ [InlineData(3.0f, -2.0f, -2.0f)]
+ [InlineData(-2.0f, 3.0f, -2.0f)]
+ public static void Min(float x, float y, float expectedResult)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Min(x, y), 0.0f);
+ }
+
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NegativeInfinity, 0.0f, 0.0f)]
+ [InlineData(float.NegativeInfinity, -1.0f, -0.0f, 0.0f)]
+ [InlineData(float.NegativeInfinity, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(float.NegativeInfinity, float.NaN, float.NaN, 0.0f)]
+ [InlineData(float.NegativeInfinity, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(float.NegativeInfinity, 1.0f, float.NegativeInfinity, 0.0f)]
+ [InlineData(float.NegativeInfinity, float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(-10.0f, float.NegativeInfinity, 0.0f, 0.0f)]
+ [InlineData(-10.0f, -1.57079633f, float.NaN, 0.0f)] // y: -(pi / 2)
+ [InlineData(-10.0f, -1.0f, -0.1f, CrossPlatformMachineEpsilon)]
+ [InlineData(-10.0f, -0.785398163f, float.NaN, 0.0f)] // y: -(pi / 4)
+ [InlineData(-10.0f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-10.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(-10.0f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-10.0f, 0.785398163f, float.NaN, 0.0f)] // y: (pi / 4)
+ [InlineData(-10.0f, 1.0f, -10.0f, CrossPlatformMachineEpsilon * 100)]
+ [InlineData(-10.0f, 1.57079633f, float.NaN, 0.0f)] // y: (pi / 2)
+ [InlineData(-10.0f, float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(-2.71828183f, float.NegativeInfinity, 0.0f, 0.0f)] // x: -(e)
+ [InlineData(-2.71828183f, -1.57079633f, float.NaN, 0.0f)] // x: -(e) y: -(pi / 2)
+ [InlineData(-2.71828183f, -1.0f, -0.367879441f, CrossPlatformMachineEpsilon)] // x: -(e)
+ [InlineData(-2.71828183f, -0.785398163f, float.NaN, 0.0f)] // x: -(e) y: -(pi / 4)
+ [InlineData(-2.71828183f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)] // x: -(e)
+ [InlineData(-2.71828183f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(-2.71828183f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)] // x: -(e)
+ [InlineData(-2.71828183f, 0.785398163f, float.NaN, 0.0f)] // x: -(e) y: (pi / 4)
+ [InlineData(-2.71828183f, 1.0f, -2.71828183f, CrossPlatformMachineEpsilon * 10)] // x: -(e) expected: (e)
+ [InlineData(-2.71828183f, 1.57079633f, float.NaN, 0.0f)] // x: -(e) y: (pi / 2)
+ [InlineData(-2.71828183f, float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(-1.0f, -1.0f, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-1.0f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-1.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(-1.0f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-1.0f, 1.0f, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.0f, float.NegativeInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(-0.0f, -3.0f, float.NegativeInfinity, 0.0f)]
+ [InlineData(-0.0f, -2.0f, float.PositiveInfinity, 0.0f)]
+ [InlineData(-0.0f, -1.57079633f, float.PositiveInfinity, 0.0f)] // y: -(pi / 2)
+ [InlineData(-0.0f, -1.0f, float.NegativeInfinity, 0.0f)]
+ [InlineData(-0.0f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(-0.0f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.0f, 1.0f, -0.0f, 0.0f)]
+ [InlineData(-0.0f, 1.57079633f, 0.0f, 0.0f)] // y: -(pi / 2)
+ [InlineData(-0.0f, 2.0f, 0.0f, 0.0f)]
+ [InlineData(-0.0f, 3.0f, -0.0f, 0.0f)]
+ [InlineData(-0.0f, float.PositiveInfinity, 0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(float.NaN, -1.0f, float.NaN, 0.0f)]
+ [InlineData(float.NaN, float.NaN, float.NaN, 0.0f)]
+ [InlineData(float.NaN, 1.0f, float.NaN, 0.0f)]
+ [InlineData(float.NaN, float.PositiveInfinity, float.NaN, 0.0f)]
+ [InlineData(0.0f, float.NegativeInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(0.0f, -3.0f, float.PositiveInfinity, 0.0f)]
+ [InlineData(0.0f, -2.0f, float.PositiveInfinity, 0.0f)]
+ [InlineData(0.0f, -1.57079633f, float.PositiveInfinity, 0.0f)] // y: -(pi / 2)
+ [InlineData(0.0f, -1.0f, float.PositiveInfinity, 0.0f)]
+ [InlineData(0.0f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(0.0f, 1.0f, 0.0f, 0.0f)]
+ [InlineData(0.0f, 1.57079633f, 0.0f, 0.0f)] // y: -(pi / 2)
+ [InlineData(0.0f, 2.0f, 0.0f, 0.0f)]
+ [InlineData(0.0f, 3.0f, 0.0f, 0.0f)]
+ [InlineData(0.0f, float.PositiveInfinity, 0.0f, 0.0f)]
+ [InlineData(1.0f, float.NegativeInfinity, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.0f, -1.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.0f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.0f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.0f, 1.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.0f, float.PositiveInfinity, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(2.71828183f, float.NegativeInfinity, 0.0f, 0.0f)]
+ [InlineData(2.71828183f, -3.14159265f, 0.0432139183f, CrossPlatformMachineEpsilon / 10)] // x: (e) y: -(pi)
+ [InlineData(2.71828183f, -2.71828183f, 0.0659880358f, CrossPlatformMachineEpsilon / 10)] // x: (e) y: -(e)
+ [InlineData(2.71828183f, -2.30258509f, 0.1f, CrossPlatformMachineEpsilon)] // x: (e) y: -(ln(10))
+ [InlineData(2.71828183f, -1.57079633f, 0.207879576f, CrossPlatformMachineEpsilon)] // x: (e) y: -(pi / 2)
+ [InlineData(2.71828183f, -1.44269504f, 0.236290088f, CrossPlatformMachineEpsilon)] // x: (e) y: -(log2(e))
+ [InlineData(2.71828183f, -1.41421356f, 0.243116734f, CrossPlatformMachineEpsilon)] // x: (e) y: -(sqrt(2))
+ [InlineData(2.71828183f, -1.12837917f, 0.323557264f, CrossPlatformMachineEpsilon)] // x: (e) y: -(2 / sqrt(pi))
+ [InlineData(2.71828183f, -1.0f, 0.367879441f, CrossPlatformMachineEpsilon)] // x: (e)
+ [InlineData(2.71828183f, -0.785398163f, 0.455938128f, CrossPlatformMachineEpsilon)] // x: (e) y: -(pi / 4)
+ [InlineData(2.71828183f, -0.707106781f, 0.493068691f, CrossPlatformMachineEpsilon)] // x: (e) y: -(1 / sqrt(2))
+ [InlineData(2.71828183f, -0.693147181f, 0.5f, CrossPlatformMachineEpsilon)] // x: (e) y: -(ln(2))
+ [InlineData(2.71828183f, -0.636619772f, 0.529077808f, CrossPlatformMachineEpsilon)] // x: (e) y: -(2 / pi)
+ [InlineData(2.71828183f, -0.434294482f, 0.647721485f, CrossPlatformMachineEpsilon)] // x: (e) y: -(log10(e))
+ [InlineData(2.71828183f, -0.318309886f, 0.727377349f, CrossPlatformMachineEpsilon)] // x: (e) y: -(1 / pi)
+ [InlineData(2.71828183f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)] // x: (e)
+ [InlineData(2.71828183f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(2.71828183f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)] // x: (e)
+ [InlineData(2.71828183f, 0.318309886f, 1.37480223f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (1 / pi)
+ [InlineData(2.71828183f, 0.434294482f, 1.54387344f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (log10(e))
+ [InlineData(2.71828183f, 0.636619772f, 1.89008116f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (2 / pi)
+ [InlineData(2.71828183f, 0.693147181f, 2.0f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (ln(2))
+ [InlineData(2.71828183f, 0.707106781f, 2.02811498f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (1 / sqrt(2))
+ [InlineData(2.71828183f, 0.785398163f, 2.19328005f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (pi / 4)
+ [InlineData(2.71828183f, 1.0f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // x: (e) expected: (e)
+ [InlineData(2.71828183f, 1.12837917f, 3.09064302f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (2 / sqrt(pi))
+ [InlineData(2.71828183f, 1.41421356f, 4.11325038f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (sqrt(2))
+ [InlineData(2.71828183f, 1.44269504f, 4.23208611f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (log2(e))
+ [InlineData(2.71828183f, 1.57079633f, 4.81047738f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (pi / 2)
+ [InlineData(2.71828183f, 2.30258509f, 10.0f, CrossPlatformMachineEpsilon * 100)] // x: (e) y: (ln(10))
+ [InlineData(2.71828183f, 2.71828183f, 15.1542622f, CrossPlatformMachineEpsilon * 100)] // x: (e) y: (e)
+ [InlineData(2.71828183f, 3.14159265f, 23.1406926f, CrossPlatformMachineEpsilon * 100)] // x: (e) y: (pi)
+ [InlineData(2.71828183f, float.PositiveInfinity, float.PositiveInfinity, 0.0f)] // x: (e)
+ [InlineData(10.0f, float.NegativeInfinity, 0.0f, 0.0f)]
+ [InlineData(10.0f, -3.14159265f, 0.000721784159f, CrossPlatformMachineEpsilon / 1000)] // y: -(pi)
+ [InlineData(10.0f, -2.71828183f, 0.00191301410f, CrossPlatformMachineEpsilon / 100)] // y: -(e)
+ [InlineData(10.0f, -2.30258509f, 0.00498212830f, CrossPlatformMachineEpsilon / 100)] // y: -(ln(10))
+ [InlineData(10.0f, -1.57079633f, 0.0268660410f, CrossPlatformMachineEpsilon / 10)] // y: -(pi / 2)
+ [InlineData(10.0f, -1.44269504f, 0.0360831928f, CrossPlatformMachineEpsilon / 10)] // y: -(log2(e))
+ [InlineData(10.0f, -1.41421356f, 0.0385288847f, CrossPlatformMachineEpsilon / 10)] // y: -(sqrt(2))
+ [InlineData(10.0f, -1.12837917f, 0.0744082059f, CrossPlatformMachineEpsilon / 10)] // y: -(2 / sqrt(pi))
+ [InlineData(10.0f, -1.0f, 0.1f, CrossPlatformMachineEpsilon)]
+ [InlineData(10.0f, -0.785398163f, 0.163908636f, CrossPlatformMachineEpsilon)] // y: -(pi / 4)
+ [InlineData(10.0f, -0.707106781f, 0.196287760f, CrossPlatformMachineEpsilon)] // y: -(1 / sqrt(2))
+ [InlineData(10.0f, -0.693147181f, 0.202699566f, CrossPlatformMachineEpsilon)] // y: -(ln(2))
+ [InlineData(10.0f, -0.636619772f, 0.230876765f, CrossPlatformMachineEpsilon)] // y: -(2 / pi)
+ [InlineData(10.0f, -0.434294482f, 0.367879441f, CrossPlatformMachineEpsilon)] // y: -(log10(e))
+ [InlineData(10.0f, -0.318309886f, 0.480496373f, CrossPlatformMachineEpsilon)] // y: -(1 / pi)
+ [InlineData(10.0f, -0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(10.0f, float.NaN, float.NaN, 0.0f)]
+ [InlineData(10.0f, 0.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(10.0f, 0.318309886f, 2.08118116f, CrossPlatformMachineEpsilon * 10)] // y: (1 / pi)
+ [InlineData(10.0f, 0.434294482f, 2.71828183f, CrossPlatformMachineEpsilon * 10)] // y: (log10(e)) expected: (e)
+ [InlineData(10.0f, 0.636619772f, 4.33131503f, CrossPlatformMachineEpsilon * 10)] // y: (2 / pi)
+ [InlineData(10.0f, 0.693147181f, 4.93340967f, CrossPlatformMachineEpsilon * 10)] // y: (ln(2))
+ [InlineData(10.0f, 0.707106781f, 5.09456117f, CrossPlatformMachineEpsilon * 10)] // y: (1 / sqrt(2))
+ [InlineData(10.0f, 0.785398163f, 6.10095980f, CrossPlatformMachineEpsilon * 10)] // y: (pi / 4)
+ [InlineData(10.0f, 1.0f, 10.0f, CrossPlatformMachineEpsilon * 100)]
+ [InlineData(10.0f, 1.12837917f, 13.4393779f, CrossPlatformMachineEpsilon * 100)] // y: (2 / sqrt(pi))
+ [InlineData(10.0f, 1.41421356f, 25.9545535f, CrossPlatformMachineEpsilon * 100)] // y: (sqrt(2))
+ [InlineData(10.0f, 1.44269504f, 27.7137338f, CrossPlatformMachineEpsilon * 100)] // y: (log2(e))
+ [InlineData(10.0f, 1.57079633f, 37.2217105f, CrossPlatformMachineEpsilon * 100)] // y: (pi / 2)
+ [InlineData(10.0f, 2.30258509f, 200.717432f, CrossPlatformMachineEpsilon * 1000)] // y: (ln(10))
+ [InlineData(10.0f, 2.71828183f, 522.735300f, CrossPlatformMachineEpsilon * 1000)] // y: (e)
+ [InlineData(10.0f, 3.14159265f, 1385.45573f, CrossPlatformMachineEpsilon * 10000)] // y: (pi)
+ [InlineData(10.0f, float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ [InlineData(float.PositiveInfinity, float.NegativeInfinity, 0.0f, 0.0f)]
+ [InlineData(float.PositiveInfinity, -1.0f, 0.0f, 0.0f)]
+ [InlineData(float.PositiveInfinity, -0.0f, 1.0f, 0.0f)]
+ [InlineData(float.PositiveInfinity, float.NaN, float.NaN, 0.0f)]
+ [InlineData(float.PositiveInfinity, 0.0f, 1.0f, 0.0f)]
+ [InlineData(float.PositiveInfinity, 1.0f, float.PositiveInfinity, 0.0f)]
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Pow(float x, float y, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Pow(x, y), allowedVariance);
+ }
+
+ public static IEnumerable Round_Digits_TestData
+ {
+ get
+ {
+ yield return new object[] { float.NaN, float.NaN, 3, MidpointRounding.ToEven };
+ yield return new object[] { float.PositiveInfinity, float.PositiveInfinity, 3, MidpointRounding.ToEven };
+ yield return new object[] { float.NegativeInfinity, float.NegativeInfinity, 3, MidpointRounding.ToEven };
+ yield return new object[] { 0, 0, 3, MidpointRounding.ToEven };
+ yield return new object[] { 3.42156f, 3.422f, 3, MidpointRounding.ToEven };
+ yield return new object[] { -3.42156f, -3.422f, 3, MidpointRounding.ToEven };
+
+ yield return new object[] { float.NaN, float.NaN, 3, MidpointRounding.AwayFromZero };
+ yield return new object[] { float.PositiveInfinity, float.PositiveInfinity, 3, MidpointRounding.AwayFromZero };
+ yield return new object[] { float.NegativeInfinity, float.NegativeInfinity, 3, MidpointRounding.AwayFromZero };
+ yield return new object[] { 0, 0, 3, MidpointRounding.AwayFromZero };
+ yield return new object[] { 3.42156f, 3.422f, 3, MidpointRounding.AwayFromZero };
+ yield return new object[] { -3.42156f, -3.422f, 3, MidpointRounding.AwayFromZero };
+ }
+ }
+
+ [Fact]
+ public static void Round()
+ {
+ Assert.Equal(0.0f, MathF.Round(0.0f));
+ Assert.Equal(1.0f, MathF.Round(1.4f));
+ Assert.Equal(2.0f, MathF.Round(1.5f));
+ Assert.Equal(2e7f, MathF.Round(2e7f));
+ Assert.Equal(0.0f, MathF.Round(-0.0f));
+ Assert.Equal(-1.0f, MathF.Round(-1.4f));
+ Assert.Equal(-2.0f, MathF.Round(-1.5f));
+ Assert.Equal(-2e7f, MathF.Round(-2e7f));
+ }
+
+ [Theory]
+ [InlineData(MidpointRounding.ToEven)]
+ [InlineData(MidpointRounding.AwayFromZero)]
+ public static void Round_Digits_ByMidpointRounding(MidpointRounding mode)
+ {
+ Assert.Equal(float.PositiveInfinity, MathF.Round(float.PositiveInfinity, 3, mode));
+ Assert.Equal(float.NegativeInfinity, MathF.Round(float.NegativeInfinity, 3, mode));
+ }
+
+ [Theory]
+ [MemberData(nameof(Round_Digits_TestData))]
+ public static void Round_Digits(float x, float expected, int digits, MidpointRounding mode)
+ {
+ AssertExtensions.Equal(expected, MathF.Round(x, digits, mode), CrossPlatformMachineEpsilon * 10);
+ }
+
+ [Fact]
+ public static void Sign()
+ {
+ Assert.Equal(0, MathF.Sign(0.0f));
+ Assert.Equal(0, MathF.Sign(-0.0f));
+ Assert.Equal(-1, MathF.Sign(-3.14f));
+ Assert.Equal(1, MathF.Sign(3.14f));
+ Assert.Equal(-1, MathF.Sign(float.NegativeInfinity));
+ Assert.Equal(1, MathF.Sign(float.PositiveInfinity));
+ Assert.Throws(() => MathF.Sign(float.NaN));
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, -0.0f, CrossPlatformMachineEpsilon)] // value: -(pi)
+ [InlineData(-2.71828183f, -0.410781291f, CrossPlatformMachineEpsilon)] // value: -(e)
+ [InlineData(-2.30258509f, -0.743980337f, CrossPlatformMachineEpsilon)] // value: -(ln(10))
+ [InlineData(-1.57079633f, -1.0f, CrossPlatformMachineEpsilon * 10)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, -0.991806244f, CrossPlatformMachineEpsilon)] // value: -(log2(e))
+ [InlineData(-1.41421356f, -0.987765946f, CrossPlatformMachineEpsilon)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, -0.903719457f, CrossPlatformMachineEpsilon)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, -0.841470985f, CrossPlatformMachineEpsilon)]
+ [InlineData(-0.785398163f, -0.707106781f, CrossPlatformMachineEpsilon)] // value: -(pi / 4), expected: -(1 / sqrt(2))
+ [InlineData(-0.707106781f, -0.649636939f, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2))
+ [InlineData(-0.693147181f, -0.638961276f, CrossPlatformMachineEpsilon)] // value: -(ln(2))
+ [InlineData(-0.636619772f, -0.594480769f, CrossPlatformMachineEpsilon)] // value: -(2 / pi)
+ [InlineData(-0.434294482f, -0.420770483f, CrossPlatformMachineEpsilon)] // value: -(log10(e))
+ [InlineData(-0.318309886f, -0.312961796f, CrossPlatformMachineEpsilon)] // value: -(1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 0.312961796f, CrossPlatformMachineEpsilon)] // value: (1 / pi)
+ [InlineData(0.434294482f, 0.420770483f, CrossPlatformMachineEpsilon)] // value: (log10(e))
+ [InlineData(0.636619772f, 0.594480769f, CrossPlatformMachineEpsilon)] // value: (2 / pi)
+ [InlineData(0.693147181f, 0.638961276f, CrossPlatformMachineEpsilon)] // value: (ln(2))
+ [InlineData(0.707106781f, 0.649636939f, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 0.707106781f, CrossPlatformMachineEpsilon)] // value: (pi / 4), expected: (1 / sqrt(2))
+ [InlineData(1.0f, 0.841470985f, CrossPlatformMachineEpsilon)]
+ [InlineData(1.12837917f, 0.903719457f, CrossPlatformMachineEpsilon)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 0.987765946f, CrossPlatformMachineEpsilon)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 0.991806244f, CrossPlatformMachineEpsilon)] // value: (log2(e))
+ [InlineData(1.57079633f, 1.0f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2)
+ [InlineData(2.30258509f, 0.743980337f, CrossPlatformMachineEpsilon)] // value: (ln(10))
+ [InlineData(2.71828183f, 0.410781291f, CrossPlatformMachineEpsilon)] // value: (e)
+ [InlineData(3.14159265f, 0.0f, CrossPlatformMachineEpsilon)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.NaN, 0.0f)]
+ public static void Sin(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Sin(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NegativeInfinity, 0.0f)]
+ [InlineData(-3.14159265f, -11.5487394f, CrossPlatformMachineEpsilon * 100)] // value: -(pi)
+ [InlineData(-2.71828183f, -7.54413710f, CrossPlatformMachineEpsilon * 10)] // value: -(e)
+ [InlineData(-2.30258509f, -4.95f, CrossPlatformMachineEpsilon * 10)] // value: -(ln(10))
+ [InlineData(-1.57079633f, -2.30129890f, CrossPlatformMachineEpsilon * 10)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, -1.99789801f, CrossPlatformMachineEpsilon * 10)] // value: -(log2(e))
+ [InlineData(-1.41421356f, -1.93506682f, CrossPlatformMachineEpsilon * 10)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, -1.38354288f, CrossPlatformMachineEpsilon * 10)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, -1.17520119f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.785398163f, -0.868670961f, CrossPlatformMachineEpsilon)] // value: -(pi / 4)
+ [InlineData(-0.707106781f, -0.767523145f, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2))
+ [InlineData(-0.693147181f, -0.75f, CrossPlatformMachineEpsilon)] // value: -(ln(2))
+ [InlineData(-0.636619772f, -0.680501678f, CrossPlatformMachineEpsilon)] // value: -(2 / pi)
+ [InlineData(-0.434294482f, -0.448075979f, CrossPlatformMachineEpsilon)] // value: -(log10(e))
+ [InlineData(-0.318309886f, -0.323712439f, CrossPlatformMachineEpsilon)] // value: -(1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 0.323712439f, CrossPlatformMachineEpsilon)] // value: (1 / pi)
+ [InlineData(0.434294482f, 0.448075979f, CrossPlatformMachineEpsilon)] // value: (log10(e))
+ [InlineData(0.636619772f, 0.680501678f, CrossPlatformMachineEpsilon)] // value: (2 / pi)
+ [InlineData(0.693147181f, 0.75f, CrossPlatformMachineEpsilon)] // value: (ln(2))
+ [InlineData(0.707106781f, 0.767523145f, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 0.868670961f, CrossPlatformMachineEpsilon)] // value: (pi / 4)
+ [InlineData(1.0f, 1.17520119f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.12837917f, 1.38354288f, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 1.93506682f, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 1.99789801f, CrossPlatformMachineEpsilon * 10)] // value: (log2(e))
+ [InlineData(1.57079633f, 2.30129890f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2)
+ [InlineData(2.30258509f, 4.95f, CrossPlatformMachineEpsilon * 10)] // value: (ln(10))
+ [InlineData(2.71828183f, 7.54413710f, CrossPlatformMachineEpsilon * 10)] // value: (e)
+ [InlineData(3.14159265f, 11.5487394f, CrossPlatformMachineEpsilon * 100)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Sinh(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Sinh(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, float.NaN, 0.0f)] // value: (pi)
+ [InlineData(-2.71828183f, float.NaN, 0.0f)] // value: (e)
+ [InlineData(-2.30258509f, float.NaN, 0.0f)] // value: (ln(10))
+ [InlineData(-1.57079633f, float.NaN, 0.0f)] // value: (pi / 2)
+ [InlineData(-1.44269504f, float.NaN, 0.0f)] // value: (log2(e))
+ [InlineData(-1.41421356f, float.NaN, 0.0f)] // value: (sqrt(2))
+ [InlineData(-1.12837917f, float.NaN, 0.0f)] // value: (2 / sqrt(pi))
+ [InlineData(-1.0f, float.NaN, 0.0f)]
+ [InlineData(-0.785398163f, float.NaN, 0.0f)] // value: (pi / 4)
+ [InlineData(-0.707106781f, float.NaN, 0.0f)] // value: (1 / sqrt(2))
+ [InlineData(-0.693147181f, float.NaN, 0.0f)] // value: (ln(2))
+ [InlineData(-0.636619772f, float.NaN, 0.0f)] // value: (2 / pi)
+ [InlineData(-0.434294482f, float.NaN, 0.0f)] // value: (log10(e))
+ [InlineData(-0.318309886f, float.NaN, 0.0f)] // value: (1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 0.564189584f, CrossPlatformMachineEpsilon)] // value: (1 / pi)
+ [InlineData(0.434294482f, 0.659010229f, CrossPlatformMachineEpsilon)] // value: (log10(e))
+ [InlineData(0.636619772f, 0.797884561f, CrossPlatformMachineEpsilon)] // value: (2 / pi)
+ [InlineData(0.693147181f, 0.832554611f, CrossPlatformMachineEpsilon)] // value: (ln(2))
+ [InlineData(0.707106781f, 0.840896415f, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 0.886226925f, CrossPlatformMachineEpsilon)] // value: (pi / 4)
+ [InlineData(1.0f, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.12837917f, 1.06225193f, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 1.18920712f, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 1.20112241f, CrossPlatformMachineEpsilon * 10)] // value: (log2(e))
+ [InlineData(1.57079633f, 1.25331414f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2)
+ [InlineData(2.30258509f, 1.51742713f, CrossPlatformMachineEpsilon * 10)] // value: (ln(10))
+ [InlineData(2.71828183f, 1.64872127f, CrossPlatformMachineEpsilon * 10)] // value: (e)
+ [InlineData(3.14159265f, 1.77245385F, CrossPlatformMachineEpsilon * 10)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.PositiveInfinity, 0.0f)]
+ public static void Sqrt(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Sqrt(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, float.NaN, 0.0f)]
+ [InlineData(-3.14159265f, -0.0f, CrossPlatformMachineEpsilon)] // value: -(pi)
+ [InlineData(-2.71828183f, 0.450549534f, CrossPlatformMachineEpsilon)] // value: -(e)
+ [InlineData(-2.30258509f, 1.11340715f, CrossPlatformMachineEpsilon * 10)] // value: -(ln(10))
+ [InlineData(-1.57079633f, 22877332.0f, 10.0f)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, -7.76357567f, CrossPlatformMachineEpsilon * 10)] // value: -(log2(e))
+ [InlineData(-1.41421356f, -6.33411917f, CrossPlatformMachineEpsilon * 10)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, -2.11087684f, CrossPlatformMachineEpsilon * 10)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, -1.55740772f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-0.785398163f, -1.0f, CrossPlatformMachineEpsilon * 10)] // value: -(pi / 4)
+ [InlineData(-0.707106781f, -0.854510432f, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2))
+ [InlineData(-0.693147181f, -0.830640878f, CrossPlatformMachineEpsilon)] // value: -(ln(2))
+ [InlineData(-0.636619772f, -0.739302950f, CrossPlatformMachineEpsilon)] // value: -(2 / pi)
+ [InlineData(-0.434294482f, -0.463829067f, CrossPlatformMachineEpsilon)] // value: -(log10(e))
+ [InlineData(-0.318309886f, -0.329514733f, CrossPlatformMachineEpsilon)] // value: -(1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 0.329514733f, CrossPlatformMachineEpsilon)] // value: (1 / pi)
+ [InlineData(0.434294482f, 0.463829067f, CrossPlatformMachineEpsilon)] // value: (log10(e))
+ [InlineData(0.636619772f, 0.739302950f, CrossPlatformMachineEpsilon)] // value: (2 / pi)
+ [InlineData(0.693147181f, 0.830640878f, CrossPlatformMachineEpsilon)] // value: (ln(2))
+ [InlineData(0.707106781f, 0.854510432f, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 1.0f, CrossPlatformMachineEpsilon * 10)] // value: (pi / 4)
+ [InlineData(1.0f, 1.55740772f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(1.12837917f, 2.11087684f, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 6.33411917f, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 7.76357567f, CrossPlatformMachineEpsilon * 10)] // value: (log2(e))
+ [InlineData(1.57079633f, -22877332.0f, 10.0f)] // value: (pi / 2)
+ [InlineData(2.30258509f, -1.11340715f, CrossPlatformMachineEpsilon * 10)] // value: (ln(10))
+ [InlineData(2.71828183f, -0.450549534f, CrossPlatformMachineEpsilon)] // value: (e)
+ [InlineData(3.14159265f, 0.0f, CrossPlatformMachineEpsilon)] // value: (pi)
+ [InlineData(float.PositiveInfinity, float.NaN, 0.0f)]
+ public static void Tan(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Tan(value), allowedVariance);
+ }
+
+ [Theory]
+ [InlineData(float.NegativeInfinity, -1.0f, CrossPlatformMachineEpsilon * 10)]
+ [InlineData(-3.14159265f, -0.996272076f, CrossPlatformMachineEpsilon)] // value: -(pi)
+ [InlineData(-2.71828183f, -0.991328916f, CrossPlatformMachineEpsilon)] // value: -(e)
+ [InlineData(-2.30258509f, -0.980198020f, CrossPlatformMachineEpsilon)] // value: -(ln(10))
+ [InlineData(-1.57079633f, -0.917152336f, CrossPlatformMachineEpsilon)] // value: -(pi / 2)
+ [InlineData(-1.44269504f, -0.894238946f, CrossPlatformMachineEpsilon)] // value: -(log2(e))
+ [InlineData(-1.41421356f, -0.888385562f, CrossPlatformMachineEpsilon)] // value: -(sqrt(2))
+ [InlineData(-1.12837917f, -0.810463806f, CrossPlatformMachineEpsilon)] // value: -(2 / sqrt(pi))
+ [InlineData(-1.0f, -0.761594156f, CrossPlatformMachineEpsilon)]
+ [InlineData(-0.785398163f, -0.655794203f, CrossPlatformMachineEpsilon)] // value: -(pi / 4)
+ [InlineData(-0.707106781f, -0.608859365f, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2))
+ [InlineData(-0.693147181f, -0.6f, CrossPlatformMachineEpsilon)] // value: -(ln(2))
+ [InlineData(-0.636619772f, -0.562593600f, CrossPlatformMachineEpsilon)] // value: -(2 / pi)
+ [InlineData(-0.434294482f, -0.408904012f, CrossPlatformMachineEpsilon)] // value: -(log10(e))
+ [InlineData(-0.318309886f, -0.307977913f, CrossPlatformMachineEpsilon)] // value: -(1 / pi)
+ [InlineData(-0.0f, -0.0f, 0.0f)]
+ [InlineData(float.NaN, float.NaN, 0.0f)]
+ [InlineData(0.0f, 0.0f, 0.0f)]
+ [InlineData(0.318309886f, 0.307977913f, CrossPlatformMachineEpsilon)] // value: (1 / pi)
+ [InlineData(0.434294482f, 0.408904012f, CrossPlatformMachineEpsilon)] // value: (log10(e))
+ [InlineData(0.636619772f, 0.562593600f, CrossPlatformMachineEpsilon)] // value: (2 / pi)
+ [InlineData(0.693147181f, 0.6f, CrossPlatformMachineEpsilon)] // value: (ln(2))
+ [InlineData(0.707106781f, 0.608859365f, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2))
+ [InlineData(0.785398163f, 0.655794203f, CrossPlatformMachineEpsilon)] // value: (pi / 4)
+ [InlineData(1.0f, 0.761594156f, CrossPlatformMachineEpsilon)]
+ [InlineData(1.12837917f, 0.810463806f, CrossPlatformMachineEpsilon)] // value: (2 / sqrt(pi))
+ [InlineData(1.41421356f, 0.888385562f, CrossPlatformMachineEpsilon)] // value: (sqrt(2))
+ [InlineData(1.44269504f, 0.894238946f, CrossPlatformMachineEpsilon)] // value: (log2(e))
+ [InlineData(1.57079633f, 0.917152336f, CrossPlatformMachineEpsilon)] // value: (pi / 2)
+ [InlineData(2.30258509f, 0.980198020f, CrossPlatformMachineEpsilon)] // value: (ln(10))
+ [InlineData(2.71828183f, 0.991328916f, CrossPlatformMachineEpsilon)] // value: (e)
+ [InlineData(3.14159265f, 0.996272076f, CrossPlatformMachineEpsilon)] // value: (pi)
+ [InlineData(float.PositiveInfinity, 1.0f, CrossPlatformMachineEpsilon * 10)]
+ public static void Tanh(float value, float expectedResult, float allowedVariance)
+ {
+ AssertExtensions.Equal(expectedResult, MathF.Tanh(value), allowedVariance);
+ }
+
+ [Fact]
+ public static void Truncate()
+ {
+ Assert.Equal(0.0f, MathF.Truncate(0.12345f));
+ Assert.Equal(3.0f, MathF.Truncate(3.14159f));
+ Assert.Equal(-3.0f, MathF.Truncate(-3.14159f));
+ }
+
+ public static IEnumerable Round_ToEven_TestData()
+ {
+ yield return new object[] { 1f, 1f };
+ yield return new object[] { 0.5f, 0f };
+ yield return new object[] { 1.5f, 2f };
+ yield return new object[] { 2.5f, 2f };
+ yield return new object[] { 3.5f, 4f };
+ yield return new object[] { 0.49999997f, 0f };
+ yield return new object[] { 1.5f, 2f };
+ yield return new object[] { 2.5f, 2f };
+ yield return new object[] { 3.5f, 4f };
+ yield return new object[] { 4.5f, 4f };
+ yield return new object[] { 3.1415927f, 3f };
+ yield return new object[] { 2.7182817f, 3f };
+ yield return new object[] { 1385.4557f, 1385f };
+ yield return new object[] { 3423.4343f, 3423f };
+ yield return new object[] { 535345.5f, 535346f };
+ yield return new object[] { 535345.5f, 535346f };
+ yield return new object[] { 535345.5f, 535346f };
+ yield return new object[] { 535345.4f, 535345f };
+ yield return new object[] { 535345.6f, 535346f };
+ yield return new object[] { -2.7182817f, -3f };
+ yield return new object[] { 10f, 10f };
+ yield return new object[] { -10f, -10f };
+ yield return new object[] { -0f, -0f };
+ yield return new object[] { 0f, 0f };
+ yield return new object[] { float.NaN, float.NaN };
+ yield return new object[] { float.PositiveInfinity, float.PositiveInfinity };
+ yield return new object[] { float.NegativeInfinity, float.NegativeInfinity };
+ yield return new object[] { 3.4028235E+38f, 3.4028235E+38f };
+ yield return new object[] { -3.4028235E+38f, -3.4028235E+38f };
+ }
+
+ [Theory]
+ [MemberData(nameof(Round_ToEven_TestData))]
+ public static void Round_ToEven_0(float value, float expected)
+ {
+ // Math.Round has special fast paths when MidpointRounding is a const
+ // Don't replace it with a variable
+ Assert.Equal(expected, MathF.Round(value, MidpointRounding.ToEven));
+ Assert.Equal(expected, MathF.Round(value, 0, MidpointRounding.ToEven));
+ }
+
+ public static IEnumerable Round_AwayFromZero_TestData()
+ {
+ yield return new object[] { 1f, 1f };
+ yield return new object[] { 0.5f, 1f };
+ yield return new object[] { 1.5f, 2f };
+ yield return new object[] { 2.5f, 3f };
+ yield return new object[] { 3.5f, 4f };
+ yield return new object[] { 0.49999997f, 0f };
+ yield return new object[] { 1.5f, 2f };
+ yield return new object[] { 2.5f, 3f };
+ yield return new object[] { 3.5f, 4f };
+ yield return new object[] { 4.5f, 5f };
+ yield return new object[] { 3.1415927f, 3f };
+ yield return new object[] { 2.7182817f, 3f };
+ yield return new object[] { 1385.4557f, 1385f };
+ yield return new object[] { 3423.4343f, 3423f };
+ yield return new object[] { 535345.5f, 535346f };
+ yield return new object[] { 535345.5f, 535346f };
+ yield return new object[] { 535345.5f, 535346f };
+ yield return new object[] { 535345.4f, 535345f };
+ yield return new object[] { 535345.6f, 535346f };
+ yield return new object[] { -2.7182817f, -3f };
+ yield return new object[] { 10f, 10f };
+ yield return new object[] { -10f, -10f };
+ yield return new object[] { -0f, -0f };
+ yield return new object[] { 0f, 0f };
+ yield return new object[] { float.NaN, float.NaN };
+ yield return new object[] { float.PositiveInfinity, float.PositiveInfinity };
+ yield return new object[] { float.NegativeInfinity, float.NegativeInfinity };
+ yield return new object[] { 3.4028235E+38f, 3.4028235E+38f };
+ yield return new object[] { -3.4028235E+38f, -3.4028235E+38f };
+ }
+
+ [Theory]
+ [MemberData(nameof(Round_AwayFromZero_TestData))]
+ public static void Round_AwayFromZero_0(float value, float expected)
+ {
+ // Math.Round has special fast paths when MidpointRounding is a const
+ // Don't replace it with a variable
+ Assert.Equal(expected, MathF.Round(value, MidpointRounding.AwayFromZero));
+ Assert.Equal(expected, MathF.Round(value, 0, MidpointRounding.AwayFromZero));
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Bcl.Numerics/tests/Microsoft.Bcl.Numerics.Tests.csproj b/src/libraries/Microsoft.Bcl.Numerics/tests/Microsoft.Bcl.Numerics.Tests.csproj
new file mode 100644
index 00000000000000..8f2abec46041a7
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.Numerics/tests/Microsoft.Bcl.Numerics.Tests.csproj
@@ -0,0 +1,15 @@
+
+
+
+ $(NetFrameworkMinimum);$(NetCoreAppCurrent)
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Bcl.TimeProvider/src/PACKAGE.md b/src/libraries/Microsoft.Bcl.TimeProvider/src/PACKAGE.md
new file mode 100644
index 00000000000000..f3c9c372cf2caf
--- /dev/null
+++ b/src/libraries/Microsoft.Bcl.TimeProvider/src/PACKAGE.md
@@ -0,0 +1,57 @@
+## About
+
+Microsoft.Bcl.TimeProvider provides time abstraction support for apps targeting .NET 7 and earlier, as well as those intended for the .NET Framework. For apps targeting .NET 8 and newer versions, referencing this package is unnecessary, as the types it contains are already included in the .NET 8 and higher platform versions.
+
+## Key Features
+
+* Provides a common abstraction for time-related operations.
+
+## How to Use
+
+```csharp
+using System;
+
+// A class that uses TimeProvider to get the current time in Utc coordinates
+public class UtcClock
+{
+ private readonly TimeProvider _timeProvider;
+
+ // Constructor that takes a TimeProvider as a dependency
+ public Clock(TimeProvider timeProvider)
+ {
+ _timeProvider = timeProvider;
+ }
+
+ // A method that returns the current time as a string
+ public string GetTime()
+ {
+ return _timeProvider.GetLocalNow().ToString("HH:mm:ss");
+ }
+}
+
+// A class that inherits from TimeProvider and overrides the GetLocalNow method
+public class UtcTimeProvider : TimeProvider
+{
+ // Override the GetLocalNow method to always return UTC time
+ public override DateTimeOffset GetLocalNow()
+ {
+ return TimeProvider.System.GetUtcNow();
+ }
+}
+
+```
+
+## Main Types
+
+The main types provided by this library are:
+
+* `TimeProvider`
+* `TimeProviderTaskExtensions`
+
+## Additional Documentation
+
+* [API documentation](https://learn.microsoft.com/dotnet/api/system.timeprovider)
+
+## Feedback & Contributing
+
+Microsoft.Bcl.TimeProvider is released as open source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/runtime).
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/PACKAGE.md b/src/libraries/Microsoft.Extensions.Caching.Memory/src/PACKAGE.md
new file mode 100644
index 00000000000000..a9e1c0e00615d6
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/PACKAGE.md
@@ -0,0 +1,89 @@
+## About
+
+
+
+Provides implementations for local and distributed in-memory cache. It stores and retrieves data in a fast and efficient way.
+
+## Key Features
+
+
+
+* A concrete implementation of the IMemoryCache interface, which represents a local in-memory cache that stores and retrieves data in a fast and efficient way
+* A distributed cache that supports higher scale-out than local cache
+* Expiration and eviction policies for its entries
+* Entry prioritization for when the cache size limit is exceeded and needs to be compacted by entry eviction
+* Track of cache statictics
+
+## How to Use
+
+
+
+Use Microsoft.Extensions.Caching.Memory over System.Runtime.Caching when working with ASP.NET Core as it provides better integration support. For example, IMemoryCache works natively with ASP.NET Core dependency injection.
+
+Local in-memory serialization:
+```csharp
+using Microsoft.Extensions.Caching.Memory;
+
+using MemoryCache cache = new(new MemoryCacheOptions());
+
+object valueToCache = new();
+string key = "key";
+
+using (ICacheEntry entry = cache.CreateEntry(key))
+{
+ // Entries are committed after they are disposed therefore it does not exist yet.
+ Console.WriteLine($"Exists: {cache.TryGetValue(key, out _)}\n");
+
+ entry.Value = valueToCache;
+ entry.SlidingExpiration = TimeSpan.FromSeconds(2);
+}
+
+bool exists = cache.TryGetValue(key, out object? cachedValue);
+Console.WriteLine($"Exists: {exists}" );
+Console.WriteLine($"cachedValue is valueToCache? {object.ReferenceEquals(cachedValue, valueToCache)}\n");
+
+Console.WriteLine("Wait for the sliding expiration...");
+Thread.Sleep(TimeSpan.FromSeconds(2));
+
+Console.WriteLine("Exists: " + cache.TryGetValue(key, out _));
+
+// You can also use the acceleration extensions to set and get entries
+string key2 = "key2";
+object value2 = new();
+
+cache.Set("key2", value2);
+
+object? cachedValue2 = cache.Get(key2);
+Console.WriteLine($"cachedValue2 is value2? {object.ReferenceEquals(cachedValue2, value2)}");
+```
+
+## Main Types
+
+
+
+The main types provided by this library are:
+
+* `Microsoft.Extensions.Caching.Memory.MemoryCache`
+* `Microsoft.Extensions.Caching.Memory.MemoryCacheOptions`
+* `Microsoft.Extensions.Caching.Distributed.MemoryDistributedCache`
+* `Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions`
+
+## Additional Documentation
+
+
+
+* [Conceptual documentation](https://learn.microsoft.com/dotnet/core/extensions/caching)
+* [Cache in-memory in ASP.NET Core](https://learn.microsoft.com/aspnet/core/performance/caching/memory)
+* [API documentation](https://learn.microsoft.com/dotnet/api/microsoft.extensions.caching.memory)
+
+## Related Packages
+
+
+
+[Microsoft.Extensions.Caching.Abstractions](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Abstractions)
+
+## Feedback & Contributing
+
+
+
+Microsoft.Extensions.Caching.Memory is released as open source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/runtime).
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/PACKAGE.md b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/PACKAGE.md
index 9a93ad1f76eb74..e744e1b9e73df1 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/PACKAGE.md
+++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/PACKAGE.md
@@ -1,18 +1,21 @@
## About
+
+
Provides abstractions of key-value pair based configuration. Interfaces defined in this package are implemented by classes in [Microsoft.Extensions.Configuration](https://www.nuget.org/packages/Microsoft.Extensions.Configuration/) and other configuration packages.
-Commonly used types:
+## Key Features
+
+
-- [Microsoft.Extensions.Configuration.IConfiguration](https://learn.microsoft.com/dotnet/api/microsoft.extensions.configuration.iconfiguration)
-- [Microsoft.Extensions.Configuration.IConfigurationBuilder](https://learn.microsoft.com/dotnet/api/microsoft.extensions.configuration.iconfigurationbuilder)
-- [Microsoft.Extensions.Configuration.IConfigurationProvider](https://learn.microsoft.com/dotnet/api/microsoft.extensions.configuration.iconfigurationprovider)
-- [Microsoft.Extensions.Configuration.IConfigurationRoot](https://learn.microsoft.com/dotnet/api/microsoft.extensions.configuration.iconfigurationroot)
-- [Microsoft.Extensions.Configuration.IConfigurationSection](https://learn.microsoft.com/dotnet/api/microsoft.extensions.configuration.iconfigurationsection)
+* Abstractions for string key-value pair configuration sources and sections
+* Path conventions of keys establishing a heirachy of values
+* Support for multiple configuration sources, aggregating and defining precdence for values
+* Support for reload on change
-For more information, see the documentation: [Configuration in .NET](https://learn.microsoft.com/dotnet/core/extensions/configuration).
+## How to Use
-## Example
+
The example below shows a small code sample using this library and trying out the `ConfigurationKeyName` attribute available since .NET 6:
@@ -39,3 +42,41 @@ var config = new ConfigurationBuilder()
var options = config.Get();
Console.WriteLine(options.NamedProperty); // returns "value for named property"
```
+
+## Main Types
+
+
+
+The main types provided by this library are:
+
+* `Microsoft.Extensions.Configuration.IConfiguration`
+* `Microsoft.Extensions.Configuration.IConfigurationBuilder`
+* `Microsoft.Extensions.Configuration.IConfigurationProvider`
+* `Microsoft.Extensions.Configuration.IConfigurationRoot`
+* `Microsoft.Extensions.Configuration.IConfigurationSection`
+
+## Additional Documentation
+
+
+
+* [Configuration in .NET](https://learn.microsoft.com/dotnet/core/extensions/configuration)
+* [API documentation](https://learn.microsoft.com/dotnet/api/microsoft.extensions.configuration)
+
+## Related Packages
+
+
+* [Microsoft.Extensions.Configuration](https://www.nuget.org/packages/Microsoft.Extensions.Configuration)
+* [Microsoft.Extensions.Configuration.Binder](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Binder)
+* [Microsoft.Extensions.Configuration.CommandLine](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.CommandLine)
+* [Microsoft.Extensions.Configuration.EnvironmentVariables](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.EnvironmentVariables)
+* [Microsoft.Extensions.Configuration.FileExtensions](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.FileExtensions)
+* [Microsoft.Extensions.Configuration.Ini](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Ini)
+* [Microsoft.Extensions.Configuration.Json](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Json)
+* [Microsoft.Extensions.Configuration.UserSecrets](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.UserSecrets)
+* [Microsoft.Extensions.Configuration.Xml](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Xml)
+
+## Feedback & Contributing
+
+
+
+Microsoft.Extensions.Caching.Abstractions is released as open source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/runtime).
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Emitter.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Emitter.cs
index a40cf2976b31fc..1721a124dead95 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Emitter.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Emitter.cs
@@ -1,9 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-using System;
-using System.Diagnostics;
-using System.Text.RegularExpressions;
using Microsoft.CodeAnalysis;
using SourceGenerators;
@@ -13,26 +10,22 @@ public sealed partial class ConfigurationBindingGenerator : IIncrementalGenerato
{
private sealed partial class Emitter
{
- private readonly SourceProductionContext _context;
- private readonly SourceGenerationSpec _sourceGenSpec;
-
- private bool _emitBlankLineBeforeNextStatement;
- private bool _useFullyQualifiedNames;
- private int _valueSuffixIndex;
-
- private static readonly Regex s_arrayBracketsRegex = new(Regex.Escape("[]"));
+ private readonly InterceptorInfo _interceptorInfo;
+ private readonly BindingHelperInfo _bindingHelperInfo;
+ private readonly TypeIndex _typeIndex;
private readonly SourceWriter _writer = new();
- public Emitter(SourceProductionContext context, SourceGenerationSpec sourceGenSpec)
+ public Emitter(SourceGenerationSpec sourceGenSpec)
{
- _context = context;
- _sourceGenSpec = sourceGenSpec;
+ _interceptorInfo = sourceGenSpec.InterceptorInfo;
+ _bindingHelperInfo = sourceGenSpec.BindingHelperInfo;
+ _typeIndex = new TypeIndex(sourceGenSpec.ConfigTypes);
}
- public void Emit()
+ public void Emit(SourceProductionContext context)
{
- if (!ShouldEmitBinders())
+ if (!ShouldEmitMethods(MethodsToGen.Any))
{
return;
}
@@ -42,214 +35,56 @@ public void Emit()
#nullable enable
#pragma warning disable CS0612, CS0618 // Suppress warnings about [Obsolete] member usage in generated code.
""");
- _writer.WriteLine();
-
- _useFullyQualifiedNames = true;
- EmitBinder_Extensions_IConfiguration();
- EmitBinder_Extensions_OptionsBuilder();
- EmitBinder_Extensions_IServiceCollection();
-
- _useFullyQualifiedNames = false;
- Emit_CoreBindingHelper();
-
- _context.AddSource($"{Identifier.GeneratedConfigurationBinder}.g.cs", _writer.ToSourceText());
- }
-
- private void EmitBindCoreCall(
- TypeSpec type,
- string memberAccessExpr,
- string configArgExpr,
- InitializationKind initKind,
- Action? writeOnSuccess = null)
- {
- Debug.Assert(type.CanInitialize);
-
- if (!type.NeedsMemberBinding)
- {
- EmitObjectInit(memberAccessExpr, initKind);
- return;
- }
-
- string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
- if (initKind is InitializationKind.AssignmentWithNullCheck)
- {
- Debug.Assert(!type.IsValueType);
- _writer.WriteLine($"{type.MinimalDisplayString}? {tempIdentifier} = {memberAccessExpr};");
- EmitBindCoreCall(tempIdentifier, InitializationKind.AssignmentWithNullCheck);
- }
- else if (initKind is InitializationKind.None && type.IsValueType)
- {
- EmitBindCoreCall(tempIdentifier, InitializationKind.Declaration);
- _writer.WriteLine($"{memberAccessExpr} = {tempIdentifier};");
- }
- else
- {
- EmitBindCoreCall(memberAccessExpr, initKind);
- }
-
- void EmitBindCoreCall(string objExpression, InitializationKind initKind)
- {
- string methodDisplayString = GetHelperMethodDisplayString(nameof(MethodsToGen_CoreBindingHelper.BindCore));
- string bindCoreCall = $@"{methodDisplayString}({configArgExpr}, ref {objExpression}, {Identifier.binderOptions});";
- EmitObjectInit(objExpression, initKind);
- _writer.WriteLine(bindCoreCall);
- writeOnSuccess?.Invoke(objExpression);
- }
+ EmitInterceptsLocationAttrDecl();
- void EmitObjectInit(string objExpression, InitializationKind initKind)
- {
- if (initKind is not InitializationKind.None)
- {
- this.EmitObjectInit(type, objExpression, initKind, configArgExpr);
- }
- }
- }
+ EmitStartBlock($"namespace {ProjectName}");
+ EmitUsingStatements();
- private void EmitBindLogicFromString(
- ParsableFromStringSpec type,
- string sectionValueExpr,
- string sectionPathExpr,
- Action? writeOnSuccess,
- bool checkForNullSectionValue,
- bool useIncrementalStringValueIdentifier)
- {
- StringParsableTypeKind typeKind = type.StringParsableTypeKind;
- Debug.Assert(typeKind is not StringParsableTypeKind.None);
-
- string nonNull_StringValue_Identifier = useIncrementalStringValueIdentifier ? GetIncrementalIdentifier(Identifier.value) : Identifier.value;
- string stringValueToParse_Expr = checkForNullSectionValue ? nonNull_StringValue_Identifier : sectionValueExpr;
-
- string parsedValueExpr;
- if (typeKind is StringParsableTypeKind.AssignFromSectionValue)
- {
- parsedValueExpr = stringValueToParse_Expr;
- }
- else if (typeKind is StringParsableTypeKind.Enum)
- {
- parsedValueExpr = $"ParseEnum<{type.MinimalDisplayString}>({stringValueToParse_Expr}, () => {sectionPathExpr})";
- }
- else
- {
- string helperMethodDisplayString = GetHelperMethodDisplayString(type.ParseMethodName);
- parsedValueExpr = $"{helperMethodDisplayString}({stringValueToParse_Expr}, () => {sectionPathExpr})";
- }
+ _writer.WriteLine();
+ EmitStartBlock($$"""
+ {{Expression.GeneratedCodeAnnotation}}
+ file static class {{Identifier.BindingExtensions}}
+ """);
+ EmitBindingExtensions_IConfiguration();
+ EmitBindingExtensions_OptionsBuilder();
+ EmitBindingExtensions_IServiceCollection();
+ EmitCoreBindingHelpers();
+ EmitEndBlock(); // BindingExtensions class
- if (!checkForNullSectionValue)
- {
- InvokeWriteOnSuccess();
- }
- else
- {
- EmitStartBlock($"if ({sectionValueExpr} is string {nonNull_StringValue_Identifier})");
- InvokeWriteOnSuccess();
- EmitEndBlock();
- }
+ EmitEndBlock(); // Binding namespace.
- void InvokeWriteOnSuccess() => writeOnSuccess?.Invoke(parsedValueExpr);
+ context.AddSource($"{Identifier.BindingExtensions}.g.cs", _writer.ToSourceText());
}
- private bool EmitObjectInit(TypeSpec type, string memberAccessExpr, InitializationKind initKind, string configArgExpr)
+ private void EmitInterceptsLocationAttrDecl()
{
- Debug.Assert(type.CanInitialize && initKind is not InitializationKind.None);
-
- string initExpr;
- CollectionSpec? collectionType = type as CollectionSpec;
-
- string effectiveDisplayString = GetTypeDisplayString(type);
- if (collectionType is not null)
- {
- if (collectionType is EnumerableSpec { InitializationStrategy: InitializationStrategy.Array })
- {
- initExpr = $"new {s_arrayBracketsRegex.Replace(effectiveDisplayString, "[0]", 1)}";
- }
- else
+ _writer.WriteLine();
+ _writer.WriteLine($$"""
+ namespace System.Runtime.CompilerServices
{
- effectiveDisplayString = GetTypeDisplayString(collectionType.ConcreteType ?? collectionType);
- initExpr = $"new {effectiveDisplayString}()";
- }
- }
- else if (type.InitializationStrategy is InitializationStrategy.ParameterlessConstructor)
- {
- initExpr = $"new {effectiveDisplayString}()";
- }
- else
- {
- Debug.Assert(type.InitializationStrategy is InitializationStrategy.ParameterizedConstructor);
- string initMethodIdentifier = GetInitalizeMethodDisplayString(((ObjectSpec)type));
- initExpr = $"{initMethodIdentifier}({configArgExpr}, {Identifier.binderOptions})";
- }
+ using System;
+ using System.CodeDom.Compiler;
- if (initKind == InitializationKind.Declaration)
- {
- Debug.Assert(!memberAccessExpr.Contains("."));
- _writer.WriteLine($"var {memberAccessExpr} = {initExpr};");
- }
- else if (initKind == InitializationKind.AssignmentWithNullCheck)
- {
- if (collectionType is CollectionSpec
- {
- InitializationStrategy: InitializationStrategy.ParameterizedConstructor or InitializationStrategy.ToEnumerableMethod
- })
- {
- if (collectionType.InitializationStrategy is InitializationStrategy.ParameterizedConstructor)
+ {{Expression.GeneratedCodeAnnotation}}
+ [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+ file sealed class InterceptsLocationAttribute : Attribute
{
- _writer.WriteLine($"{memberAccessExpr} = {memberAccessExpr} is null ? {initExpr} : new {effectiveDisplayString}({memberAccessExpr});");
- }
- else
- {
- _writer.WriteLine($"{memberAccessExpr} = {memberAccessExpr} is null ? {initExpr} : {memberAccessExpr}.{collectionType.ToEnumerableMethodCall!};");
+ public InterceptsLocationAttribute(string filePath, int line, int column)
+ {
+ }
}
}
- else
- {
- _writer.WriteLine($"{memberAccessExpr} ??= {initExpr};");
- }
- }
- else
- {
- Debug.Assert(initKind is InitializationKind.SimpleAssignment);
- _writer.WriteLine($"{memberAccessExpr} = {initExpr};");
- }
-
- return true;
+ """);
+ _writer.WriteLine();
}
- private void EmitCastToIConfigurationSection()
+ private void EmitUsingStatements()
{
- string sectionTypeDisplayString;
- string exceptionTypeDisplayString;
- if (_useFullyQualifiedNames)
+ foreach (string @namespace in _bindingHelperInfo.Namespaces)
{
- sectionTypeDisplayString = "global::Microsoft.Extensions.Configuration.IConfigurationSection";
- exceptionTypeDisplayString = FullyQualifiedDisplayString.InvalidOperationException;
+ _writer.WriteLine($"using {@namespace};");
}
- else
- {
- sectionTypeDisplayString = Identifier.IConfigurationSection;
- exceptionTypeDisplayString = nameof(InvalidOperationException);
- }
-
- _writer.WriteLine($$"""
- if ({{Identifier.configuration}} is not {{sectionTypeDisplayString}} {{Identifier.section}})
- {
- throw new {{exceptionTypeDisplayString}}();
- }
- """);
- }
-
- private void EmitIConfigurationHasValueOrChildrenCheck(bool voidReturn)
- {
- string returnPostfix = voidReturn ? string.Empty : " null";
- string methodDisplayString = GetHelperMethodDisplayString(Identifier.HasValueOrChildren);
-
- _writer.WriteLine($$"""
- if (!{{methodDisplayString}}({{Identifier.configuration}}))
- {
- return{{returnPostfix}};
- }
- """);
- _writer.WriteLine();
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs
index 758311958c4515..d01c5dbae13f3c 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs
@@ -1,202 +1,212 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
+using System.Threading;
using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Operations;
+using SourceGenerators;
namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
public sealed partial class ConfigurationBindingGenerator : IIncrementalGenerator
{
- private sealed partial class Parser
+ internal sealed partial class Parser(CompilationData compilationData)
{
- private record struct InvocationDiagnosticInfo(DiagnosticDescriptor Descriptor, object[]? MessageArgs);
+ private readonly KnownTypeSymbols _typeSymbols = compilationData.TypeSymbols!;
+ private readonly bool _langVersionIsSupported = compilationData.LanguageVersionIsSupported;
- private readonly SourceProductionContext _context;
- private readonly SourceGenerationSpec _sourceGenSpec = new();
- private readonly KnownTypeSymbols _typeSymbols;
- private readonly ImmutableArray _invocations;
+ private readonly List _invocationTypeParseInfo = new();
+ private readonly Queue _typesToParse = new();
+ private readonly Dictionary _createdTypeSpecs = new(SymbolEqualityComparer.Default);
- private readonly Dictionary _createdSpecs = new(SymbolEqualityComparer.Default);
- private readonly HashSet _unsupportedTypes = new(SymbolEqualityComparer.Default);
+ private readonly InterceptorInfo.Builder _interceptorInfoBuilder = new();
+ private BindingHelperInfo.Builder? _helperInfoBuilder; // Init'ed with type index when registering interceptors, after creating type specs.
- private readonly List _invocationTargetTypeDiags = new();
- private readonly Dictionary> _typeDiagnostics = new(SymbolEqualityComparer.Default);
+ public List? Diagnostics { get; private set; }
- public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, ImmutableArray invocations)
+ public SourceGenerationSpec? GetSourceGenerationSpec(ImmutableArray invocations, CancellationToken cancellationToken)
{
- _context = context;
- _typeSymbols = typeSymbols;
- _invocations = invocations;
- }
+ if (!_langVersionIsSupported)
+ {
+ RecordDiagnostic(DiagnosticDescriptors.LanguageVersionNotSupported, trimmedLocation: Location.None);
+ return null;
+ }
- public SourceGenerationSpec? GetSourceGenerationSpec()
- {
if (_typeSymbols is not { IConfiguration: { }, ConfigurationBinder: { } })
{
return null;
}
- foreach (BinderInvocation invocation in _invocations)
+ ParseInvocations(invocations);
+ CreateTypeSpecs(cancellationToken);
+ RegisterInterceptors();
+
+ return new SourceGenerationSpec
{
- IInvocationOperation invocationOperation = invocation.Operation!;
- if (!invocationOperation.TargetMethod.IsExtensionMethod)
- {
- continue;
- }
+ InterceptorInfo = _interceptorInfoBuilder.ToIncrementalValue(),
+ BindingHelperInfo = _helperInfoBuilder!.ToIncrementalValue(),
+ ConfigTypes = _createdTypeSpecs.Values.OrderBy(s => s.TypeRef.FullyQualifiedName).ToImmutableEquatableArray(),
+ };
+ }
+
+ private bool IsValidRootConfigType([NotNullWhen(true)] ITypeSymbol? type)
+ {
+ if (type is null ||
+ type.SpecialType is SpecialType.System_Object or SpecialType.System_Void ||
+ !_typeSymbols.Compilation.IsSymbolAccessibleWithin(type, _typeSymbols.Compilation.Assembly) ||
+ type.TypeKind is TypeKind.TypeParameter or TypeKind.Pointer or TypeKind.Error ||
+ type.IsRefLikeType ||
+ ContainsGenericParameters(type))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ private void ParseInvocations(ImmutableArray invocations)
+ {
+ foreach (BinderInvocation? invocation in invocations)
+ {
+ Debug.Assert(invocation is not null);
+ IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
+ INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
+ Debug.Assert(targetMethod.IsExtensionMethod);
- INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
{
- RegisterMethodInvocation_ConfigurationBinder(invocation);
+ ParseInvocation_ConfigurationBinder(invocation);
}
else if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.OptionsBuilderConfigurationExtensions))
{
- RegisterMethodInvocation_OptionsBuilderExt(invocation);
+ ParseInvocation_OptionsBuilderExt(invocation);
}
else if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.OptionsConfigurationServiceCollectionExtensions))
{
- RegisterMethodInvocation_ServiceCollectionExt(invocation);
+ ParseInvocation_ServiceCollectionExt(invocation);
}
}
-
- return _sourceGenSpec;
}
- private static bool IsValidRootConfigType(ITypeSymbol? type)
+ private void CreateTypeSpecs(CancellationToken cancellationToken)
{
- if (type is null ||
- type.SpecialType is SpecialType.System_Object or SpecialType.System_Void ||
- type.TypeKind is TypeKind.TypeParameter or TypeKind.Pointer or TypeKind.Error ||
- type.IsRefLikeType ||
- ContainsGenericParameters(type))
+ while (_typesToParse.Count > 0)
{
- return false;
- }
+ cancellationToken.ThrowIfCancellationRequested();
- return true;
+ TypeParseInfo typeParseInfo = _typesToParse.Dequeue();
+ ITypeSymbol typeSymbol = typeParseInfo.TypeSymbol;
+
+ if (!_createdTypeSpecs.ContainsKey(typeSymbol))
+ {
+ _createdTypeSpecs.Add(typeSymbol, CreateTypeSpec(typeParseInfo));
+ }
+ }
}
- private TypeSpec? GetTargetTypeForRootInvocation(ITypeSymbol? type, Location? invocationLocation)
+ private void RegisterInterceptors()
{
- if (!IsValidRootConfigType(type))
+ TypeIndex typeIndex = new(_createdTypeSpecs.Values);
+ _helperInfoBuilder = new(typeIndex);
+
+ foreach (TypeParseInfo typeParseInfo in _invocationTypeParseInfo)
{
- _context.ReportDiagnostic(Diagnostic.Create(Diagnostics.CouldNotDetermineTypeInfo, invocationLocation));
- return null;
+ TypeSpec typeSpec = _createdTypeSpecs[typeParseInfo.TypeSymbol];
+ MethodsToGen overload = typeParseInfo.BindingOverload;
+
+ if ((MethodsToGen.ConfigBinder_Any & overload) is not 0)
+ {
+ RegisterInterceptor_ConfigurationBinder(typeParseInfo, typeSpec);
+ }
+ else if ((MethodsToGen.OptionsBuilderExt_Any & overload) is not 0)
+ {
+ RegisterInterceptor_OptionsBuilderExt(typeParseInfo, typeSpec);
+ }
+ else
+ {
+ Debug.Assert((MethodsToGen.ServiceCollectionExt_Any & overload) is not 0);
+ RegisterInterceptor_ServiceCollectionExt(typeParseInfo, typeSpec);
+ }
}
+ }
- return GetTargetTypeForRootInvocationCore(type, invocationLocation);
+ private void EnqueueTargetTypeForRootInvocation(ITypeSymbol? typeSymbol, MethodsToGen overload, BinderInvocation invocation)
+ {
+ if (!IsValidRootConfigType(typeSymbol))
+ {
+ RecordDiagnostic(DiagnosticDescriptors.CouldNotDetermineTypeInfo, invocation.Location);
+ }
+ else
+ {
+ TypeParseInfo typeParseInfo = TypeParseInfo.Create(typeSymbol, overload, invocation, containingTypeDiagInfo: null);
+ _typesToParse.Enqueue(typeParseInfo);
+ _invocationTypeParseInfo.Add(typeParseInfo);
+ }
}
- public TypeSpec? GetTargetTypeForRootInvocationCore(ITypeSymbol type, Location? invocationLocation)
+ private TypeRef EnqueueTransitiveType(TypeParseInfo containingTypeParseInfo, ITypeSymbol memberTypeSymbol, DiagnosticDescriptor diagDescriptor, string? memberName = null)
{
- TypeSpec? spec = GetOrCreateTypeSpec(type);
+ TypeParseInfo memberTypeParseInfo = containingTypeParseInfo.ToTransitiveTypeParseInfo(memberTypeSymbol, diagDescriptor, memberName);
- foreach (InvocationDiagnosticInfo diag in _invocationTargetTypeDiags)
+ if (_createdTypeSpecs.TryGetValue(memberTypeSymbol, out TypeSpec? memberTypeSpec))
{
- _context.ReportDiagnostic(Diagnostic.Create(diag.Descriptor, invocationLocation, diag.MessageArgs));
+ RecordTypeDiagnosticIfRequired(memberTypeParseInfo, memberTypeSpec);
+ return memberTypeSpec.TypeRef;
}
- _invocationTargetTypeDiags.Clear();
- return spec;
+ _typesToParse.Enqueue(memberTypeParseInfo);
+ return new TypeRef(memberTypeSymbol);
}
- private TypeSpec? GetOrCreateTypeSpec(ITypeSymbol type)
+ private TypeSpec CreateTypeSpec(TypeParseInfo typeParseInfo)
{
- if (_createdSpecs.TryGetValue(type, out TypeSpec? spec))
- {
- if (_typeDiagnostics.TryGetValue(type, out HashSet? typeDiags))
- {
- _invocationTargetTypeDiags.AddRange(typeDiags);
- }
-
- return spec;
- }
+ ITypeSymbol type = typeParseInfo.TypeSymbol;
+ TypeSpec spec;
if (IsNullable(type, out ITypeSymbol? underlyingType))
{
- spec = TryGetTypeSpec(underlyingType, Diagnostics.NullableUnderlyingTypeNotSupported, out TypeSpec? underlyingTypeSpec)
- ? new NullableSpec(type, underlyingTypeSpec)
- : null;
+ TypeRef underlyingTypeRef = EnqueueTransitiveType(
+ typeParseInfo,
+ underlyingType,
+ DiagnosticDescriptors.NullableUnderlyingTypeNotSupported);
+
+ spec = new NullableSpec(type, underlyingTypeRef);
}
else if (IsParsableFromString(type, out StringParsableTypeKind specialTypeKind))
{
ParsableFromStringSpec stringParsableSpec = new(type) { StringParsableTypeKind = specialTypeKind };
-
- if (stringParsableSpec.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue)
- {
- _sourceGenSpec.PrimitivesForHelperGen.Add(stringParsableSpec);
- }
-
spec = stringParsableSpec;
}
- else if (IsSupportedArrayType(type))
+ else if (type.TypeKind is TypeKind.Array)
{
- spec = CreateArraySpec((type as IArrayTypeSymbol));
+ spec = CreateArraySpec(typeParseInfo);
+ Debug.Assert(spec is ArraySpec or UnsupportedTypeSpec);
}
else if (IsCollection(type))
{
- spec = CreateCollectionSpec((INamedTypeSymbol)type);
+ spec = CreateCollectionSpec(typeParseInfo);
}
else if (SymbolEqualityComparer.Default.Equals(type, _typeSymbols.IConfigurationSection))
{
spec = new ConfigurationSectionSpec(type);
}
- else if (type is INamedTypeSymbol namedType)
+ else if (type is INamedTypeSymbol)
{
- // List is used in generated code as a temp holder for formatting
- // an error for config properties that don't map to object properties.
- _sourceGenSpec.TypeNamespaces.Add("System.Collections.Generic");
-
- spec = CreateObjectSpec(namedType);
+ spec = CreateObjectSpec(typeParseInfo);
}
else
{
- RegisterUnsupportedType(type, Diagnostics.TypeNotSupported);
+ spec = CreateUnsupportedTypeSpec(typeParseInfo, NotSupportedReason.UnknownType);
}
- foreach (InvocationDiagnosticInfo diag in _invocationTargetTypeDiags)
- {
- RegisterTypeDiagnostic(type, diag);
- }
-
- if (spec is null)
- {
- return null;
- }
-
- string @namespace = spec.Namespace;
- if (@namespace is not null and not "")
- {
- _sourceGenSpec.TypeNamespaces.Add(@namespace);
- }
-
- return _createdSpecs[type] = spec;
- }
+ RecordTypeDiagnosticIfRequired(typeParseInfo, spec);
- private void RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper method, TypeSpec type)
- {
- if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(method, out HashSet? types))
- {
- _sourceGenSpec.TypesForGen_CoreBindingHelper_Methods[method] = types = new HashSet();
- }
-
- types.Add(type);
- _sourceGenSpec.MethodsToGen_CoreBindingHelper |= method;
- }
-
- private void RegisterTypeForBindCoreUntypedGen(TypeSpec typeSpec)
- {
- if (typeSpec.NeedsMemberBinding)
- {
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCore, typeSpec);
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCoreUntyped, typeSpec);
- }
+ return spec;
}
private static bool IsNullable(ITypeSymbol type, [NotNullWhen(true)] out ITypeSymbol? underlyingType)
@@ -317,265 +327,197 @@ private bool IsParsableFromString(ITypeSymbol type, out StringParsableTypeKind t
}
}
- private bool TryGetTypeSpec(ITypeSymbol type, DiagnosticDescriptor descriptor, out TypeSpec? spec)
+ private TypeSpec CreateArraySpec(TypeParseInfo typeParseInfo)
{
- spec = GetOrCreateTypeSpec(type);
+ IArrayTypeSymbol typeSymbol = (IArrayTypeSymbol)typeParseInfo.TypeSymbol;
- if (spec is null)
+ if (typeSymbol.Rank > 1)
{
- RegisterUnsupportedType(type, descriptor);
- return false;
+ return CreateUnsupportedTypeSpec(typeParseInfo, NotSupportedReason.MultiDimArraysNotSupported);
}
- return true;
- }
-
- private EnumerableSpec? CreateArraySpec(IArrayTypeSymbol arrayType)
- {
- if (!TryGetTypeSpec(arrayType.ElementType, Diagnostics.ElementTypeNotSupported, out TypeSpec elementSpec))
- {
- return null;
- }
-
- // We want a BindCore method for List as a temp holder for the array values. We know the element type is supported.
- EnumerableSpec listSpec = (GetOrCreateTypeSpec(_typeSymbols.List.Construct(arrayType.ElementType)) as EnumerableSpec)!;
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCore, listSpec);
+ TypeRef elementTypeRef = EnqueueTransitiveType(
+ typeParseInfo,
+ typeSymbol.ElementType,
+ DiagnosticDescriptors.ElementTypeNotSupported);
- EnumerableSpec spec = new EnumerableSpec(arrayType)
+ return new ArraySpec(typeSymbol)
{
- ElementType = elementSpec,
- ConcreteType = listSpec,
- InitializationStrategy = InitializationStrategy.Array,
- PopulationStrategy = CollectionPopulationStrategy.Cast_Then_Add, // Using the concrete list type as a temp holder.
- ToEnumerableMethodCall = null,
+ ElementTypeRef = elementTypeRef,
};
-
- Debug.Assert(spec.CanInitialize);
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCore, spec);
-
- return spec;
}
- private bool IsSupportedArrayType(ITypeSymbol type)
+ private TypeSpec CreateCollectionSpec(TypeParseInfo typeParseInfo)
{
- if (type is not IArrayTypeSymbol arrayType)
- {
- return false;
- }
+ INamedTypeSymbol type = (INamedTypeSymbol)typeParseInfo.TypeSymbol;
- if (arrayType.Rank > 1)
+ TypeSpec spec;
+ if (IsCandidateDictionary(type, out ITypeSymbol? keyType, out ITypeSymbol? elementType))
{
- RegisterUnsupportedType(arrayType, Diagnostics.MultiDimArraysNotSupported);
- return false;
- }
-
- return true;
- }
-
- private CollectionSpec? CreateCollectionSpec(INamedTypeSymbol type)
- {
- CollectionSpec? spec;
- if (IsCandidateDictionary(type, out ITypeSymbol keyType, out ITypeSymbol elementType))
- {
- spec = CreateDictionarySpec(type, keyType, elementType);
- Debug.Assert(spec is null or DictionarySpec { KeyType: null or ParsableFromStringSpec });
+ spec = CreateDictionarySpec(typeParseInfo, keyType, elementType);
+ Debug.Assert(spec is DictionarySpec or UnsupportedTypeSpec);
}
else
{
- spec = CreateEnumerableSpec(type);
- }
-
- if (spec is not null)
- {
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCore, spec);
- spec.InitExceptionMessage ??= spec.ElementType.InitExceptionMessage;
+ spec = CreateEnumerableSpec(typeParseInfo);
+ Debug.Assert(spec is EnumerableSpec or UnsupportedTypeSpec);
}
return spec;
}
- private DictionarySpec CreateDictionarySpec(INamedTypeSymbol type, ITypeSymbol keyType, ITypeSymbol elementType)
+ private TypeSpec CreateDictionarySpec(TypeParseInfo typeParseInfo, ITypeSymbol keyTypeSymbol, ITypeSymbol elementTypeSymbol)
{
- if (!TryGetTypeSpec(keyType, Diagnostics.DictionaryKeyNotSupported, out TypeSpec keySpec) ||
- !TryGetTypeSpec(elementType, Diagnostics.ElementTypeNotSupported, out TypeSpec elementSpec))
- {
- return null;
- }
+ INamedTypeSymbol type = (INamedTypeSymbol)typeParseInfo.TypeSymbol;
- if (keySpec.SpecKind != TypeSpecKind.ParsableFromString)
- {
- RegisterUnsupportedType(type, Diagnostics.DictionaryKeyNotSupported);
- return null;
- }
-
- InitializationStrategy constructionStrategy;
- CollectionPopulationStrategy populationStrategy;
- INamedTypeSymbol? concreteType = null;
- INamedTypeSymbol? populationCastType = null;
- string? toEnumerableMethodCall = null;
+ CollectionInstantiationStrategy instantiationStrategy;
+ CollectionInstantiationConcreteType instantiationConcreteType;
+ CollectionPopulationCastType populationCastType;
if (HasPublicParameterLessCtor(type))
{
- constructionStrategy = InitializationStrategy.ParameterlessConstructor;
+ instantiationStrategy = CollectionInstantiationStrategy.ParameterlessConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.Self;
- if (HasAddMethod(type, keyType, elementType))
+ if (HasAddMethod(type, keyTypeSymbol, elementTypeSymbol))
{
- populationStrategy = CollectionPopulationStrategy.Add;
+ populationCastType = CollectionPopulationCastType.NotApplicable;
}
- else if (GetInterface(type, _typeSymbols.GenericIDictionary_Unbound) is not null)
+ else if (_typeSymbols.GenericIDictionary is not null && GetInterface(type, _typeSymbols.GenericIDictionary_Unbound) is not null)
{
- populationCastType = _typeSymbols.GenericIDictionary;
- populationStrategy = CollectionPopulationStrategy.Cast_Then_Add;
+ populationCastType = CollectionPopulationCastType.IDictionary;
}
else
{
- RegisterUnsupportedType(type, Diagnostics.CollectionNotSupported);
- return null;
+ return CreateUnsupportedCollectionSpec(typeParseInfo);
}
}
- else if (IsInterfaceMatch(type, _typeSymbols.GenericIDictionary_Unbound) || IsInterfaceMatch(type, _typeSymbols.IDictionary))
+ else if (_typeSymbols.Dictionary is not null &&
+ (IsInterfaceMatch(type, _typeSymbols.GenericIDictionary_Unbound) || IsInterfaceMatch(type, _typeSymbols.IDictionary)))
{
- concreteType = _typeSymbols.Dictionary;
- constructionStrategy = InitializationStrategy.ParameterlessConstructor;
- populationStrategy = CollectionPopulationStrategy.Add;
+ instantiationStrategy = CollectionInstantiationStrategy.ParameterlessConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.Dictionary;
+ populationCastType = CollectionPopulationCastType.NotApplicable;
}
- else if (IsInterfaceMatch(type, _typeSymbols.IReadOnlyDictionary_Unbound))
+ else if (_typeSymbols.Dictionary is not null && IsInterfaceMatch(type, _typeSymbols.IReadOnlyDictionary_Unbound))
{
- concreteType = _typeSymbols.Dictionary;
- populationCastType = _typeSymbols.GenericIDictionary;
- constructionStrategy = InitializationStrategy.ToEnumerableMethod;
- populationStrategy = CollectionPopulationStrategy.Cast_Then_Add;
- toEnumerableMethodCall = "ToDictionary(pair => pair.Key, pair => pair.Value)";
- _sourceGenSpec.TypeNamespaces.Add("System.Linq");
+ instantiationStrategy = CollectionInstantiationStrategy.LinqToDictionary;
+ instantiationConcreteType = CollectionInstantiationConcreteType.Dictionary;
+ populationCastType = CollectionPopulationCastType.IDictionary;
}
else
{
- RegisterUnsupportedType(type, Diagnostics.CollectionNotSupported);
- return null;
+ return CreateUnsupportedCollectionSpec(typeParseInfo);
}
- DictionarySpec spec = new(type)
+ TypeRef keyTypeRef = EnqueueTransitiveType(typeParseInfo, keyTypeSymbol, DiagnosticDescriptors.DictionaryKeyNotSupported);
+ TypeRef elementTypeRef = EnqueueTransitiveType(typeParseInfo, elementTypeSymbol, DiagnosticDescriptors.ElementTypeNotSupported);
+
+ return new DictionarySpec(type)
{
- KeyType = (ParsableFromStringSpec)keySpec,
- ElementType = elementSpec,
- InitializationStrategy = constructionStrategy,
- PopulationStrategy = populationStrategy,
- ToEnumerableMethodCall = toEnumerableMethodCall,
+ KeyTypeRef = keyTypeRef,
+ ElementTypeRef = elementTypeRef,
+ InstantiationStrategy = instantiationStrategy,
+ InstantiationConcreteType = instantiationConcreteType,
+ PopulationCastType = populationCastType,
};
-
- Debug.Assert(!(populationStrategy is CollectionPopulationStrategy.Cast_Then_Add && populationCastType is null));
- spec.ConcreteType = ConstructGenericCollectionSpecIfRequired(concreteType, keyType, elementType);
- spec.PopulationCastType = ConstructGenericCollectionSpecIfRequired(populationCastType, keyType, elementType);
-
- return spec;
}
- private EnumerableSpec? CreateEnumerableSpec(INamedTypeSymbol type)
+ private TypeSpec CreateEnumerableSpec(TypeParseInfo typeParseInfo)
{
- if (!TryGetElementType(type, out ITypeSymbol? elementType) ||
- !TryGetTypeSpec(elementType, Diagnostics.ElementTypeNotSupported, out TypeSpec elementSpec))
+ INamedTypeSymbol type = (INamedTypeSymbol)typeParseInfo.TypeSymbol;
+
+ if (!TryGetElementType(type, out ITypeSymbol? elementType))
{
- return null;
+ return CreateUnsupportedCollectionSpec(typeParseInfo);
}
- InitializationStrategy constructionStrategy;
- CollectionPopulationStrategy populationStrategy;
- INamedTypeSymbol? concreteType = null;
- INamedTypeSymbol? populationCastType = null;
+ CollectionInstantiationStrategy instantiationStrategy;
+ CollectionInstantiationConcreteType instantiationConcreteType;
+ CollectionPopulationCastType populationCastType;
if (HasPublicParameterLessCtor(type))
{
- constructionStrategy = InitializationStrategy.ParameterlessConstructor;
+ instantiationStrategy = CollectionInstantiationStrategy.ParameterlessConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.Self;
if (HasAddMethod(type, elementType))
{
- populationStrategy = CollectionPopulationStrategy.Add;
+ populationCastType = CollectionPopulationCastType.NotApplicable;
}
- else if (GetInterface(type, _typeSymbols.GenericICollection_Unbound) is not null)
+ else if (_typeSymbols.GenericICollection is not null && GetInterface(type, _typeSymbols.GenericICollection_Unbound) is not null)
{
- populationCastType = _typeSymbols.GenericICollection;
- populationStrategy = CollectionPopulationStrategy.Cast_Then_Add;
+ populationCastType = CollectionPopulationCastType.ICollection;
}
else
{
- RegisterUnsupportedType(type, Diagnostics.CollectionNotSupported);
- return null;
+ return CreateUnsupportedCollectionSpec(typeParseInfo);
}
}
- else if (IsInterfaceMatch(type, _typeSymbols.GenericICollection_Unbound) ||
- IsInterfaceMatch(type, _typeSymbols.GenericIList_Unbound))
+ else if ((IsInterfaceMatch(type, _typeSymbols.GenericICollection_Unbound) || IsInterfaceMatch(type, _typeSymbols.GenericIList_Unbound)))
{
- concreteType = _typeSymbols.List;
- constructionStrategy = InitializationStrategy.ParameterlessConstructor;
- populationStrategy = CollectionPopulationStrategy.Add;
+ instantiationStrategy = CollectionInstantiationStrategy.ParameterlessConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.List;
+ populationCastType = CollectionPopulationCastType.NotApplicable;
}
else if (IsInterfaceMatch(type, _typeSymbols.GenericIEnumerable_Unbound))
{
- concreteType = _typeSymbols.List;
- populationCastType = _typeSymbols.GenericICollection;
- constructionStrategy = InitializationStrategy.ParameterizedConstructor;
- populationStrategy = CollectionPopulationStrategy.Cast_Then_Add;
+ instantiationStrategy = CollectionInstantiationStrategy.CopyConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.List;
+ populationCastType = CollectionPopulationCastType.ICollection;
}
else if (IsInterfaceMatch(type, _typeSymbols.ISet_Unbound))
{
- concreteType = _typeSymbols.HashSet;
- constructionStrategy = InitializationStrategy.ParameterlessConstructor;
- populationStrategy = CollectionPopulationStrategy.Add;
+ instantiationStrategy = CollectionInstantiationStrategy.ParameterlessConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.HashSet;
+ populationCastType = CollectionPopulationCastType.NotApplicable;
}
else if (IsInterfaceMatch(type, _typeSymbols.IReadOnlySet_Unbound))
{
- concreteType = _typeSymbols.HashSet;
- populationCastType = _typeSymbols.ISet;
- constructionStrategy = InitializationStrategy.ParameterizedConstructor;
- populationStrategy = CollectionPopulationStrategy.Cast_Then_Add;
+ instantiationStrategy = CollectionInstantiationStrategy.CopyConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.HashSet;
+ populationCastType = CollectionPopulationCastType.ISet;
}
else if (IsInterfaceMatch(type, _typeSymbols.IReadOnlyList_Unbound) || IsInterfaceMatch(type, _typeSymbols.IReadOnlyCollection_Unbound))
{
- concreteType = _typeSymbols.List;
- populationCastType = _typeSymbols.GenericICollection;
- constructionStrategy = InitializationStrategy.ParameterizedConstructor;
- populationStrategy = CollectionPopulationStrategy.Cast_Then_Add;
+ instantiationStrategy = CollectionInstantiationStrategy.CopyConstructor;
+ instantiationConcreteType = CollectionInstantiationConcreteType.List;
+ populationCastType = CollectionPopulationCastType.ICollection;
}
else
{
- RegisterUnsupportedType(type, Diagnostics.CollectionNotSupported);
- return null;
+ return CreateUnsupportedCollectionSpec(typeParseInfo);
}
- Register_AsConfigWithChildren_HelperForGen_IfRequired(elementSpec);
+ TypeRef elementTypeRef = EnqueueTransitiveType(typeParseInfo, elementType, DiagnosticDescriptors.ElementTypeNotSupported);
- EnumerableSpec spec = new(type)
+ return new EnumerableSpec(type)
{
- ElementType = elementSpec,
- InitializationStrategy = constructionStrategy,
- PopulationStrategy = populationStrategy,
- ToEnumerableMethodCall = null,
+ ElementTypeRef = elementTypeRef,
+ InstantiationStrategy = instantiationStrategy,
+ InstantiationConcreteType = instantiationConcreteType,
+ PopulationCastType = populationCastType,
};
-
- Debug.Assert(!(populationStrategy is CollectionPopulationStrategy.Cast_Then_Add && populationCastType is null));
- spec.ConcreteType = ConstructGenericCollectionSpecIfRequired(concreteType, elementType);
- spec.PopulationCastType = ConstructGenericCollectionSpecIfRequired(populationCastType, elementType);
-
- return spec;
}
- private ObjectSpec? CreateObjectSpec(INamedTypeSymbol type)
+ private ObjectSpec CreateObjectSpec(TypeParseInfo typeParseInfo)
{
- // Add spec to cache before traversing properties to avoid stack overflow.
- ObjectSpec objectSpec = new(type);
- _createdSpecs.Add(type, objectSpec);
+ INamedTypeSymbol typeSymbol = (INamedTypeSymbol)typeParseInfo.TypeSymbol;
+ string typeName = typeSymbol.GetTypeName().Name;
+
+ ObjectInstantiationStrategy initializationStrategy = ObjectInstantiationStrategy.None;
+ DiagnosticDescriptor? initDiagDescriptor = null;
+ string? initExceptionMessage = null;
- string typeName = objectSpec.Name;
IMethodSymbol? ctor = null;
- DiagnosticDescriptor? diagnosticDescriptor = null;
- if (!(type.IsAbstract || type.TypeKind is TypeKind.Interface))
+ if (!(typeSymbol.IsAbstract || typeSymbol.TypeKind is TypeKind.Interface))
{
IMethodSymbol? parameterlessCtor = null;
IMethodSymbol? parameterizedCtor = null;
bool hasMultipleParameterizedCtors = false;
- foreach (IMethodSymbol candidate in type.InstanceConstructors)
+ foreach (IMethodSymbol candidate in typeSymbol.InstanceConstructors)
{
if (candidate.DeclaredAccessibility is not Accessibility.Public)
{
@@ -596,35 +538,38 @@ private DictionarySpec CreateDictionarySpec(INamedTypeSymbol type, ITypeSymbol k
}
}
- bool hasPublicParameterlessCtor = type.IsValueType || parameterlessCtor is not null;
+ bool hasPublicParameterlessCtor = typeSymbol.IsValueType || parameterlessCtor is not null;
if (!hasPublicParameterlessCtor && hasMultipleParameterizedCtors)
{
- diagnosticDescriptor = Diagnostics.MultipleParameterizedConstructors;
- objectSpec.InitExceptionMessage = string.Format(Emitter.ExceptionMessages.MultipleParameterizedConstructors, typeName);
+ initDiagDescriptor = DiagnosticDescriptors.MultipleParameterizedConstructors;
+ initExceptionMessage = string.Format(Emitter.ExceptionMessages.MultipleParameterizedConstructors, typeName);
}
- ctor = type.IsValueType
+ ctor = typeSymbol.IsValueType
// Roslyn ctor fetching APIs include paramerterless ctors for structs, unlike System.Reflection.
? parameterizedCtor ?? parameterlessCtor
: parameterlessCtor ?? parameterizedCtor;
}
- objectSpec.InitializationStrategy = ctor?.Parameters.Length is 0 ? InitializationStrategy.ParameterlessConstructor : InitializationStrategy.ParameterizedConstructor;
-
if (ctor is null)
{
- diagnosticDescriptor = Diagnostics.MissingPublicInstanceConstructor;
- objectSpec.InitExceptionMessage = string.Format(Emitter.ExceptionMessages.MissingPublicInstanceConstructor, typeName);
+ initDiagDescriptor = DiagnosticDescriptors.MissingPublicInstanceConstructor;
+ initExceptionMessage = string.Format(Emitter.ExceptionMessages.MissingPublicInstanceConstructor, typeName);
+ }
+ else
+ {
+ initializationStrategy = ctor.Parameters.Length is 0 ? ObjectInstantiationStrategy.ParameterlessConstructor : ObjectInstantiationStrategy.ParameterizedConstructor;
}
- if (diagnosticDescriptor is not null)
+ if (initDiagDescriptor is not null)
{
- Debug.Assert(objectSpec.InitExceptionMessage is not null);
- RegisterUnsupportedType(type, diagnosticDescriptor);
- return objectSpec;
+ Debug.Assert(initExceptionMessage is not null);
+ RecordTypeDiagnostic(typeParseInfo, initDiagDescriptor);
}
- INamedTypeSymbol current = type;
+ Dictionary? properties = null;
+
+ INamedTypeSymbol? current = typeSymbol;
while (current is not null)
{
ImmutableArray members = current.GetMembers();
@@ -633,106 +578,90 @@ private DictionarySpec CreateDictionarySpec(INamedTypeSymbol type, ITypeSymbol k
if (member is IPropertySymbol { IsIndexer: false, IsImplicitlyDeclared: false } property)
{
string propertyName = property.Name;
- TypeSpec? propertyTypeSpec = GetOrCreateTypeSpec(property.Type);
+ TypeRef propertyTypeRef = EnqueueTransitiveType(typeParseInfo, property.Type, DiagnosticDescriptors.PropertyNotSupported, propertyName);
- if (propertyTypeSpec?.CanInitialize is not true)
- {
- InvocationDiagnosticInfo propertyDiagnostic = new InvocationDiagnosticInfo(Diagnostics.PropertyNotSupported, new string[] { propertyName, type.ToDisplayString() });
- RegisterTypeDiagnostic(causingType: type, propertyDiagnostic);
- _invocationTargetTypeDiags.Add(propertyDiagnostic);
- }
+ AttributeData? attributeData = property.GetAttributes().FirstOrDefault(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _typeSymbols.ConfigurationKeyNameAttribute));
+ string configKeyName = attributeData?.ConstructorArguments.FirstOrDefault().Value as string ?? propertyName;
- if (propertyTypeSpec is not null)
+ PropertySpec spec = new(property)
{
- AttributeData? attributeData = property.GetAttributes().FirstOrDefault(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _typeSymbols.ConfigurationKeyNameAttribute));
- string configKeyName = attributeData?.ConstructorArguments.FirstOrDefault().Value as string ?? propertyName;
+ TypeRef = propertyTypeRef,
+ ConfigurationKeyName = configKeyName
+ };
- PropertySpec spec = new(property) { Type = propertyTypeSpec, ConfigurationKeyName = configKeyName };
- objectSpec.Properties[propertyName] = spec;
- Register_AsConfigWithChildren_HelperForGen_IfRequired(propertyTypeSpec);
- }
+ (properties ??= new(StringComparer.OrdinalIgnoreCase))[propertyName] = spec;
}
}
current = current.BaseType;
}
- if (objectSpec.InitializationStrategy is InitializationStrategy.ParameterizedConstructor)
+ List? ctorParams = null;
+
+ if (initializationStrategy is ObjectInstantiationStrategy.ParameterizedConstructor)
{
- List missingParameters = new();
- List invalidParameters = new();
+ Debug.Assert(ctor is not null);
+ List? missingParameters = null;
+ List? invalidParameters = null;
foreach (IParameterSymbol parameter in ctor.Parameters)
{
string parameterName = parameter.Name;
- if (!objectSpec.Properties.TryGetValue(parameterName, out PropertySpec? propertySpec))
+ if (properties?.TryGetValue(parameterName, out PropertySpec? propertySpec) is not true)
{
- missingParameters.Add(parameterName);
+ (missingParameters ??= new()).Add(parameterName);
}
else if (parameter.RefKind is not RefKind.None)
{
- invalidParameters.Add(parameterName);
+ (invalidParameters ??= new()).Add(parameterName);
}
else
{
ParameterSpec paramSpec = new ParameterSpec(parameter)
{
- Type = propertySpec.Type,
+ TypeRef = propertySpec.TypeRef,
ConfigurationKeyName = propertySpec.ConfigurationKeyName,
};
propertySpec.MatchingCtorParam = paramSpec;
- objectSpec.ConstructorParameters.Add(paramSpec);
+ (ctorParams ??= new()).Add(paramSpec);
}
}
- if (invalidParameters.Count > 0)
+ if (invalidParameters?.Count > 0)
{
- objectSpec.InitExceptionMessage = string.Format(Emitter.ExceptionMessages.CannotBindToConstructorParameter, typeName, FormatParams(invalidParameters));
+ initExceptionMessage = string.Format(Emitter.ExceptionMessages.CannotBindToConstructorParameter, typeName, FormatParams(invalidParameters));
}
- else if (missingParameters.Count > 0)
+ else if (missingParameters?.Count > 0)
{
- if (type.IsValueType)
+ if (typeSymbol.IsValueType)
{
- objectSpec.InitializationStrategy = InitializationStrategy.ParameterlessConstructor;
+ initializationStrategy = ObjectInstantiationStrategy.ParameterlessConstructor;
}
else
{
- objectSpec.InitExceptionMessage = string.Format(Emitter.ExceptionMessages.ConstructorParametersDoNotMatchProperties, typeName, FormatParams(missingParameters));
+ initExceptionMessage = string.Format(Emitter.ExceptionMessages.ConstructorParametersDoNotMatchProperties, typeName, FormatParams(missingParameters));
}
}
- if (objectSpec.CanInitialize)
- {
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.Initialize, objectSpec);
- }
-
static string FormatParams(List names) => string.Join(",", names);
}
- Debug.Assert((objectSpec.CanInitialize && objectSpec.InitExceptionMessage is null) ||
- (!objectSpec.CanInitialize && objectSpec.InitExceptionMessage is not null));
-
- if (objectSpec.NeedsMemberBinding)
- {
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCore, objectSpec);
- }
-
- return objectSpec;
+ return new ObjectSpec(
+ typeSymbol,
+ initializationStrategy,
+ properties: properties?.Values.ToImmutableEquatableArray(),
+ constructorParameters: ctorParams?.ToImmutableEquatableArray(),
+ initExceptionMessage);
}
- private void Register_AsConfigWithChildren_HelperForGen_IfRequired(TypeSpec type)
- {
- if (type.SpecKind is TypeSpecKind.Object or
- TypeSpecKind.Enumerable or
- TypeSpecKind.Dictionary)
- {
+ private static UnsupportedTypeSpec CreateUnsupportedCollectionSpec(TypeParseInfo typeParseInfo)
+ => CreateUnsupportedTypeSpec(typeParseInfo, NotSupportedReason.CollectionNotSupported);
- _sourceGenSpec.MethodsToGen_CoreBindingHelper |= MethodsToGen_CoreBindingHelper.AsConfigWithChildren;
- }
- }
+ private static UnsupportedTypeSpec CreateUnsupportedTypeSpec(TypeParseInfo typeParseInfo, NotSupportedReason reason) =>
+ new(typeParseInfo.TypeSymbol) { NotSupportedReason = reason };
- private bool TryGetElementType(INamedTypeSymbol type, out ITypeSymbol? elementType)
+ private bool TryGetElementType(INamedTypeSymbol type, [NotNullWhen(true)] out ITypeSymbol? elementType)
{
INamedTypeSymbol? candidate = GetInterface(type, _typeSymbols.GenericIEnumerable_Unbound);
@@ -746,7 +675,7 @@ private bool TryGetElementType(INamedTypeSymbol type, out ITypeSymbol? elementTy
return false;
}
- private bool IsCandidateDictionary(INamedTypeSymbol type, out ITypeSymbol? keyType, out ITypeSymbol? elementType)
+ private bool IsCandidateDictionary(INamedTypeSymbol type, [NotNullWhen(true)] out ITypeSymbol? keyType, [NotNullWhen(true)] out ITypeSymbol? elementType)
{
INamedTypeSymbol? candidate = GetInterface(type, _typeSymbols.GenericIDictionary_Unbound) ?? GetInterface(type, _typeSymbols.IReadOnlyDictionary_Unbound);
@@ -772,8 +701,13 @@ private bool IsCandidateDictionary(INamedTypeSymbol type, out ITypeSymbol? keyTy
private bool IsCollection(ITypeSymbol type) =>
type is INamedTypeSymbol namedType && GetInterface(namedType, _typeSymbols.IEnumerable) is not null;
- private static INamedTypeSymbol? GetInterface(INamedTypeSymbol type, INamedTypeSymbol @interface)
+ private static INamedTypeSymbol? GetInterface(INamedTypeSymbol type, INamedTypeSymbol? @interface)
{
+ if (@interface is null)
+ {
+ return null;
+ }
+
if (IsInterfaceMatch(type, @interface))
{
return type;
@@ -790,8 +724,13 @@ private bool IsCollection(ITypeSymbol type) =>
return type.AllInterfaces.FirstOrDefault(candidate => SymbolEqualityComparer.Default.Equals(candidate, @interface));
}
- private static bool IsInterfaceMatch(INamedTypeSymbol type, INamedTypeSymbol @interface)
+ private static bool IsInterfaceMatch(INamedTypeSymbol type, INamedTypeSymbol? @interface)
{
+ if (@interface is null)
+ {
+ return false;
+ }
+
if (type.IsGenericType)
{
INamedTypeSymbol unbound = type.ConstructUnboundGenericType();
@@ -825,8 +764,8 @@ private static bool HasPublicParameterLessCtor(INamedTypeSymbol type) =>
private static bool HasAddMethod(INamedTypeSymbol type, ITypeSymbol element)
{
- INamedTypeSymbol current = type;
- while (current != null)
+ INamedTypeSymbol? current = type;
+ while (current is not null)
{
if (current.GetMembers("Add").Any(member =>
member is IMethodSymbol { Parameters.Length: 1 } method &&
@@ -841,8 +780,8 @@ private static bool HasAddMethod(INamedTypeSymbol type, ITypeSymbol element)
private static bool HasAddMethod(INamedTypeSymbol type, ITypeSymbol key, ITypeSymbol element)
{
- INamedTypeSymbol current = type;
- while (current != null)
+ INamedTypeSymbol? current = type;
+ while (current is not null)
{
if (current.GetMembers("Add").Any(member =>
member is IMethodSymbol { Parameters.Length: 2 } method &&
@@ -858,40 +797,51 @@ private static bool HasAddMethod(INamedTypeSymbol type, ITypeSymbol key, ITypeSy
private static bool IsEnum(ITypeSymbol type) => type is INamedTypeSymbol { EnumUnderlyingType: INamedTypeSymbol { } };
- private CollectionSpec? ConstructGenericCollectionSpecIfRequired(INamedTypeSymbol? collectionType, params ITypeSymbol[] parameters) =>
- (collectionType is not null ? ConstructGenericCollectionSpec(collectionType, parameters) : null);
-
- private CollectionSpec? ConstructGenericCollectionSpec(INamedTypeSymbol type, params ITypeSymbol[] parameters)
- {
- Debug.Assert(type.IsGenericType);
- INamedTypeSymbol constructedType = type.Construct(parameters);
- return CreateCollectionSpec(constructedType);
- }
-
- private void RegisterUnsupportedType(ITypeSymbol type, DiagnosticDescriptor descriptor = null)
+ private void RecordTypeDiagnosticIfRequired(TypeParseInfo typeParseInfo, TypeSpec typeSpec)
{
- InvocationDiagnosticInfo diagInfo = new(descriptor, new string[] { type.ToDisplayString() });
+ ContainingTypeDiagnosticInfo? containingTypeDiagInfo = typeParseInfo.ContainingTypeDiagnosticInfo;
- if (!_unsupportedTypes.Contains(type))
+ if (typeSpec is UnsupportedTypeSpec unsupportedTypeSpec)
+ {
+ DiagnosticDescriptor descriptor = DiagnosticDescriptors.GetNotSupportedDescriptor(unsupportedTypeSpec.NotSupportedReason);
+ RecordTypeDiagnostic(typeParseInfo, descriptor);
+ }
+ else if (containingTypeDiagInfo?.Descriptor == DiagnosticDescriptors.DictionaryKeyNotSupported &&
+ typeSpec is not ParsableFromStringSpec)
{
- RegisterTypeDiagnostic(type, diagInfo);
- _unsupportedTypes.Add(type);
+ ReportContainingTypeDiagnosticIfRequired(typeParseInfo);
}
+ }
- _invocationTargetTypeDiags.Add(diagInfo);
+ private void RecordTypeDiagnostic(TypeParseInfo typeParseInfo, DiagnosticDescriptor descriptor)
+ {
+ RecordDiagnostic(descriptor, typeParseInfo.BinderInvocation.Location, new object?[] { typeParseInfo.TypeName });
+ ReportContainingTypeDiagnosticIfRequired(typeParseInfo);
}
- private void RegisterTypeDiagnostic(ITypeSymbol causingType, InvocationDiagnosticInfo info)
+ private void ReportContainingTypeDiagnosticIfRequired(TypeParseInfo typeParseInfo)
{
- bool typeHadDiags = _typeDiagnostics.TryGetValue(causingType, out HashSet? typeDiags);
- typeDiags ??= new HashSet();
- typeDiags.Add(info);
+ ContainingTypeDiagnosticInfo? containingTypeDiagInfo = typeParseInfo.ContainingTypeDiagnosticInfo;
- if (!typeHadDiags)
+ while (containingTypeDiagInfo is not null)
{
- _typeDiagnostics[causingType] = typeDiags;
+ string containingTypeName = containingTypeDiagInfo.TypeName;
+
+ object[] messageArgs = containingTypeDiagInfo.MemberName is string memberName
+ ? new[] { memberName, containingTypeName }
+ : new[] { containingTypeName };
+
+ RecordDiagnostic(containingTypeDiagInfo.Descriptor, typeParseInfo.BinderInvocation.Location, messageArgs);
+
+ containingTypeDiagInfo = containingTypeDiagInfo.ContainingTypeInfo;
}
}
+
+ private void RecordDiagnostic(DiagnosticDescriptor descriptor, Location trimmedLocation, params object?[]? messageArgs)
+ {
+ Diagnostics ??= new List();
+ Diagnostics.Add(DiagnosticInfo.Create(descriptor, trimmedLocation, messageArgs));
+ }
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Suppressor.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Suppressor.cs
new file mode 100644
index 00000000000000..13158753c3f075
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Suppressor.cs
@@ -0,0 +1,70 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed partial class ConfigurationBindingGenerator
+ {
+ ///
+ /// Supresses false-positive diagnostics emitted by the linker
+ /// when analyzing binding invocations that we have intercepted.
+ /// Workaround for https://github.com/dotnet/roslyn/issues/68669.
+ ///
+ [DiagnosticAnalyzer(LanguageNames.CSharp)]
+ public sealed class Suppressor : DiagnosticSuppressor
+ {
+ private const string Justification = "The target method has been intercepted by a generated static variant.";
+
+ ///
+ /// Suppression descriptor for IL2026: Members attributed with RequiresUnreferencedCode may break when trimming.
+ ///
+ private static readonly SuppressionDescriptor RUCDiagnostic = new(id: "SYSLIBSUPPRESS0002", suppressedDiagnosticId: "IL2026", Justification);
+
+ ///
+ /// Suppression descriptor for IL3050: Avoid calling members annotated with 'RequiresDynamicCodeAttribute' when publishing as native AOT.
+ ///
+ private static readonly SuppressionDescriptor RDCDiagnostic = new(id: "SYSLIBSUPPRESS0003", suppressedDiagnosticId: "IL3050", Justification);
+
+ public override ImmutableArray SupportedSuppressions => ImmutableArray.Create(RUCDiagnostic, RDCDiagnostic);
+
+ public override void ReportSuppressions(SuppressionAnalysisContext context)
+ {
+ foreach (Diagnostic diagnostic in context.ReportedDiagnostics)
+ {
+ string diagnosticId = diagnostic.Id;
+
+ if (diagnosticId != RDCDiagnostic.SuppressedDiagnosticId && diagnosticId != RUCDiagnostic.SuppressedDiagnosticId)
+ {
+ continue;
+ }
+
+ Location location = diagnostic.AdditionalLocations.Count > 0
+ ? diagnostic.AdditionalLocations[0]
+ : diagnostic.Location;
+
+ bool shouldSuppressDiagnostic =
+ location.SourceTree is SyntaxTree sourceTree &&
+ sourceTree.GetRoot().FindNode(location.SourceSpan) is SyntaxNode syntaxNode &&
+ BinderInvocation.IsCandidateSyntaxNode(syntaxNode) &&
+ context.GetSemanticModel(sourceTree)
+ .GetOperation((InvocationExpressionSyntax)syntaxNode, context.CancellationToken) is IInvocationOperation operation &&
+ BinderInvocation.IsBindingOperation(operation);
+
+ if (shouldSuppressDiagnostic)
+ {
+ SuppressionDescriptor targetSuppression = diagnosticId == RUCDiagnostic.SuppressedDiagnosticId
+ ? RUCDiagnostic
+ : RDCDiagnostic;
+ context.ReportSuppression(Suppression.Create(targetSuppression, diagnostic));
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs
index 5d7a830c729542..ec4b234a61045c 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs
@@ -2,10 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
//#define LAUNCH_DEBUGGER
-using System.Collections.Immutable;
+using System;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
+using SourceGenerators;
namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
@@ -15,7 +15,9 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
[Generator]
public sealed partial class ConfigurationBindingGenerator : IIncrementalGenerator
{
- internal const string ProjectName = "Microsoft.Extensions.Configuration.Binder.SourceGeneration";
+ private static readonly string ProjectName = Emitter.s_assemblyName.Name!;
+
+ public const string GenSpecTrackingName = nameof(SourceGenerationSpec);
public void Initialize(IncrementalGeneratorInitializationContext context)
{
@@ -31,49 +33,72 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
? new CompilationData((CSharpCompilation)compilation)
: null);
- IncrementalValuesProvider inputCalls = context.SyntaxProvider
+ IncrementalValueProvider<(SourceGenerationSpec?, ImmutableEquatableArray?)> genSpec = context.SyntaxProvider
.CreateSyntaxProvider(
- (node, _) => node is InvocationExpressionSyntax invocation,
+ (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
BinderInvocation.Create)
- .Where(operation => operation is not null);
+ .Where(invocation => invocation is not null)
+ .Collect()
+ .Combine(compilationData)
+ .Select((tuple, cancellationToken) =>
+ {
+ if (tuple.Right is not CompilationData compilationData)
+ {
+ return (null, null);
+ }
- IncrementalValueProvider<(CompilationData?, ImmutableArray)> inputData = compilationData.Combine(inputCalls.Collect());
+ try
+ {
+ Parser parser = new(compilationData);
+ SourceGenerationSpec? spec = parser.GetSourceGenerationSpec(tuple.Left, cancellationToken);
+ ImmutableEquatableArray? diagnostics = parser.Diagnostics?.ToImmutableEquatableArray();
+ return (spec, diagnostics);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ })
+ .WithTrackingName(GenSpecTrackingName);
- context.RegisterSourceOutput(inputData, (spc, source) => Execute(source.Item1, source.Item2, spc));
+ context.RegisterSourceOutput(genSpec, ReportDiagnosticsAndEmitSource);
}
///
- /// Generates source code to optimize binding with ConfigurationBinder.
+ /// Instrumentation helper for unit tests.
///
- private static void Execute(CompilationData compilationData, ImmutableArray inputCalls, SourceProductionContext context)
- {
- if (inputCalls.IsDefaultOrEmpty)
- {
- return;
- }
+ public Action? OnSourceEmitting { get; init; }
- if (compilationData?.LanguageVersionIsSupported is not true)
+ private void ReportDiagnosticsAndEmitSource(SourceProductionContext sourceProductionContext, (SourceGenerationSpec? SourceGenerationSpec, ImmutableEquatableArray? Diagnostics) input)
+ {
+ if (input.Diagnostics is ImmutableEquatableArray diagnostics)
{
- context.ReportDiagnostic(Diagnostic.Create(Parser.Diagnostics.LanguageVersionNotSupported, location: null));
- return;
+ foreach (DiagnosticInfo diagnostic in diagnostics)
+ {
+ sourceProductionContext.ReportDiagnostic(diagnostic.CreateDiagnostic());
+ }
}
- Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
- if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
+ if (input.SourceGenerationSpec is SourceGenerationSpec spec)
{
- Emitter emitter = new(context, spec);
- emitter.Emit();
+ OnSourceEmitting?.Invoke(spec);
+ Emitter emitter = new(spec);
+ emitter.Emit(sourceProductionContext);
}
}
- private sealed record CompilationData
+ internal sealed class CompilationData
{
public bool LanguageVersionIsSupported { get; }
public KnownTypeSymbols? TypeSymbols { get; }
public CompilationData(CSharpCompilation compilation)
{
- LanguageVersionIsSupported = compilation.LanguageVersion >= LanguageVersion.CSharp11;
+ // We don't have a CSharp21 value available yet. Polyfill the value here for forward compat, rather than use the LangugeVersion.Preview enum value.
+ // https://github.com/dotnet/roslyn/blob/168689931cb4e3150641ec2fb188a64ce4b3b790/src/Compilers/CSharp/Portable/LanguageVersion.cs#L218-L232
+ const int LangVersion_CSharp12 = 1200;
+ LanguageVersionIsSupported = (int)compilation.LanguageVersion >= LangVersion_CSharp12;
+
if (LanguageVersionIsSupported)
{
TypeSymbols = new KnownTypeSymbols(compilation);
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/ConfigurationBinder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/ConfigurationBinder.cs
new file mode 100644
index 00000000000000..7d723139bde3e4
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/ConfigurationBinder.cs
@@ -0,0 +1,168 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed partial class ConfigurationBindingGenerator
+ {
+ private sealed partial class Emitter
+ {
+ private void EmitBindingExtensions_IConfiguration()
+ {
+ if (!ShouldEmitMethods(MethodsToGen.ConfigBinder_Any))
+ {
+ return;
+ }
+
+ EmitBindingExtStartRegion(Identifier.IConfiguration);
+ EmitGetMethods();
+ EmitGetValueMethods();
+ EmitBindMethods_ConfigurationBinder();
+ EmitBindingExtEndRegion();
+ }
+
+ private void EmitGetMethods()
+ {
+ const string expressionForGetCore = nameof(MethodsToGen_CoreBindingHelper.GetCore);
+ const string documentation = "Attempts to bind the configuration instance to a new instance of type T.";
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_Get_T))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_Get_T, documentation);
+ _writer.WriteLine($"public static T? {Identifier.Get}(this {Identifier.IConfiguration} {Identifier.configuration}) => " +
+ $"(T?)({expressionForGetCore}({Identifier.configuration}, typeof(T), {Identifier.configureOptions}: null) ?? default(T));");
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_Get_T_BinderOptions))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_Get_T_BinderOptions, documentation);
+ _writer.WriteLine($"public static T? {Identifier.Get}(this {Identifier.IConfiguration} {Identifier.configuration}, {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureOptions}) => " +
+ $"(T?)({expressionForGetCore}({Identifier.configuration}, typeof(T), {Identifier.configureOptions}) ?? default(T));");
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_Get_TypeOf))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_Get_TypeOf, documentation);
+ _writer.WriteLine($"public static object? {Identifier.Get}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}) => " +
+ $"{expressionForGetCore}({Identifier.configuration}, {Identifier.type}, {Identifier.configureOptions}: null);");
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_Get_TypeOf_BinderOptions))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_Get_TypeOf_BinderOptions, documentation);
+ _writer.WriteLine($"public static object? {Identifier.Get}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}, {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureOptions}) => " +
+ $"{expressionForGetCore}({Identifier.configuration}, {Identifier.type}, {Identifier.configureOptions});");
+ }
+ }
+
+ private void EmitGetValueMethods()
+ {
+ const string expressionForGetValueCore = $"{Identifier.BindingExtensions}.{nameof(MethodsToGen_CoreBindingHelper.GetValueCore)}";
+ const string documentation = "Extracts the value with the specified key and converts it to the specified type.";
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_GetValue_T_key))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_GetValue_T_key, documentation);
+ _writer.WriteLine($"public static T? {Identifier.GetValue}(this {Identifier.IConfiguration} {Identifier.configuration}, string {Identifier.key}) => " +
+ $"(T?)({expressionForGetValueCore}({Identifier.configuration}, typeof(T), {Identifier.key}) ?? default(T));");
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_GetValue_T_key_defaultValue))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_GetValue_T_key_defaultValue, documentation);
+ _writer.WriteLine($"public static T? {Identifier.GetValue}(this {Identifier.IConfiguration} {Identifier.configuration}, string {Identifier.key}, T {Identifier.defaultValue}) => " +
+ $"(T?)({expressionForGetValueCore}({Identifier.configuration}, typeof(T), {Identifier.key}) ?? {Identifier.defaultValue});");
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_GetValue_TypeOf_key))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_GetValue_TypeOf_key, documentation);
+ _writer.WriteLine($"public static object? {Identifier.GetValue}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}, string {Identifier.key}) => " +
+ $"{expressionForGetValueCore}({Identifier.configuration}, {Identifier.type}, {Identifier.key});");
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_GetValue_TypeOf_key_defaultValue))
+ {
+ EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen.ConfigBinder_GetValue_TypeOf_key_defaultValue, documentation);
+ _writer.WriteLine($"public static object? {Identifier.GetValue}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}, string {Identifier.key}, object? {Identifier.defaultValue}) => " +
+ $"{expressionForGetValueCore}({Identifier.configuration}, {Identifier.type}, {Identifier.key}) ?? {Identifier.defaultValue};");
+ }
+ }
+
+ private void EmitBindMethods_ConfigurationBinder()
+ {
+ if (!ShouldEmitMethods(MethodsToGen.ConfigBinder_Bind))
+ {
+ return;
+ }
+
+ string instanceParamExpr = $"object? {Identifier.instance}";
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_Bind_instance))
+ {
+ EmitMethods(
+ _interceptorInfo.ConfigBinder_Bind_instance,
+ additionalParams: instanceParamExpr,
+ configExpression: Identifier.configuration,
+ configureOptions: false);
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_Bind_instance_BinderOptions))
+ {
+ EmitMethods(
+ _interceptorInfo.ConfigBinder_Bind_instance_BinderOptions,
+ additionalParams: $"{instanceParamExpr}, {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureOptions}",
+ configExpression: Identifier.configuration,
+ configureOptions: true);
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ConfigBinder_Bind_key_instance))
+ {
+ EmitMethods(
+ _interceptorInfo.ConfigBinder_Bind_key_instance,
+ additionalParams: $"string {Identifier.key}, {instanceParamExpr}",
+ configExpression: $"{Expression.configurationGetSection}({Identifier.key})",
+ configureOptions: false);
+ }
+
+ void EmitMethods(ImmutableEquatableArray? interceptorInfo, string additionalParams, string configExpression, bool configureOptions)
+ {
+ Debug.Assert(interceptorInfo is not null);
+
+ foreach ((ComplexTypeSpec type, ImmutableEquatableArray locations) in interceptorInfo)
+ {
+ EmitBlankLineIfRequired();
+ _writer.WriteLine($"/// Attempts to bind the given object instance to configuration values by matching property names against configuration keys recursively.");
+ EmitInterceptsLocationAnnotations(locations);
+ EmitStartBlock($"public static void {Identifier.Bind}_{type.IdentifierCompatibleSubstring}(this {Identifier.IConfiguration} {Identifier.configuration}, {additionalParams})");
+
+ if (_typeIndex.HasBindableMembers(type))
+ {
+ Debug.Assert(!type.IsValueType);
+ string binderOptionsArg = configureOptions ? $"{Identifier.GetBinderOptions}({Identifier.configureOptions})" : $"{Identifier.binderOptions}: null";
+
+ EmitCheckForNullArgument_WithBlankLine(Identifier.configuration);
+ EmitCheckForNullArgument_WithBlankLine(Identifier.instance, voidReturn: true);
+ _writer.WriteLine($$"""
+ var {{Identifier.typedObj}} = ({{type.DisplayString}}){{Identifier.instance}};
+ {{nameof(MethodsToGen_CoreBindingHelper.BindCore)}}({{configExpression}}, ref {{Identifier.typedObj}}, defaultValueIfNotFound: false, {{binderOptionsArg}});
+ """);
+ }
+
+ EmitEndBlock();
+ }
+ }
+ }
+
+ private void EmitStartDefinition_Get_Or_GetValue_Overload(MethodsToGen overload, string documentation)
+ {
+ EmitBlankLineIfRequired();
+ _writer.WriteLine($"/// {documentation}");
+ EmitInterceptsLocationAnnotations(overload);
+ }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/CoreBindingHelpers.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/CoreBindingHelpers.cs
new file mode 100644
index 00000000000000..1e14094c664408
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/CoreBindingHelpers.cs
@@ -0,0 +1,1267 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Microsoft.CodeAnalysis;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed partial class ConfigurationBindingGenerator
+ {
+ private sealed partial class Emitter
+ {
+ private int _valueSuffixIndex;
+ private bool _emitBlankLineBeforeNextStatement;
+ private static readonly Regex s_arrayBracketsRegex = new(Regex.Escape("[]"));
+
+ private bool ShouldEmitMethods(MethodsToGen_CoreBindingHelper methods) => (_bindingHelperInfo.MethodsToGen & methods) != 0;
+
+ private void EmitCoreBindingHelpers()
+ {
+ Debug.Assert(_emitBlankLineBeforeNextStatement);
+ EmitBindingExtStartRegion("Core binding");
+ EmitConfigurationKeyCaches();
+ EmitGetCoreMethod();
+ EmitGetValueCoreMethod();
+ EmitBindCoreMainMethod();
+ EmitBindCoreMethods();
+ EmitInitializeMethods();
+ EmitHelperMethods();
+ EmitBindingExtEndRegion();
+ }
+
+ private void EmitConfigurationKeyCaches()
+ {
+ if (_bindingHelperInfo.TypesForGen_BindCore is not { Count: not 0 } types)
+ {
+ return;
+ }
+
+ EmitBlankLineIfRequired();
+
+ foreach (TypeSpec type in types)
+ {
+ if (type is not ObjectSpec objectType)
+ {
+ continue;
+ }
+
+ Debug.Assert(_typeIndex.HasBindableMembers(objectType));
+
+ HashSet? keys = null;
+ static string GetCacheElement(MemberSpec member) => $@"""{member.ConfigurationKeyName}""";
+
+ if (objectType.ConstructorParameters?.Select(m => GetCacheElement(m)) is IEnumerable paramNames)
+ {
+ keys = new(paramNames);
+ }
+
+ if (objectType.Properties?.Select(m => GetCacheElement(m)) is IEnumerable propNames)
+ {
+ if (keys is null)
+ {
+ keys = new(propNames);
+ }
+ else
+ {
+ keys.UnionWith(propNames);
+ }
+ }
+
+ // Type has bindable members.
+ Debug.Assert(keys is not null);
+
+ string configKeysSource = string.Join(", ", keys);
+ string fieldName = TypeIndex.GetConfigKeyCacheFieldName(objectType);
+ _writer.WriteLine($@"private readonly static Lazy<{TypeDisplayString.HashSetOfString}> {fieldName} = new(() => new {TypeDisplayString.HashSetOfString}(StringComparer.OrdinalIgnoreCase) {{ {configKeysSource} }});");
+ }
+ }
+
+ private void EmitGetCoreMethod()
+ {
+ if (_bindingHelperInfo.TypesForGen_GetCore is not { Count: not 0 } targetTypes)
+ {
+ return;
+ }
+
+ EmitBlankLineIfRequired();
+ EmitStartBlock($"public static object? {nameof(MethodsToGen_CoreBindingHelper.GetCore)}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}, Action<{Identifier.BinderOptions}>? {Identifier.configureOptions})");
+
+ EmitCheckForNullArgument_WithBlankLine(Identifier.configuration);
+
+ _writer.WriteLine($"{Identifier.BinderOptions}? {Identifier.binderOptions} = {Identifier.GetBinderOptions}({Identifier.configureOptions});");
+ _writer.WriteLine();
+
+ EmitIConfigurationHasValueOrChildrenCheck(voidReturn: false);
+
+ bool isFirstType = true;
+ foreach (TypeSpec type in targetTypes)
+ {
+ Debug.Assert(_typeIndex.CanBindTo(type.TypeRef));
+
+ TypeSpec effectiveType = _typeIndex.GetEffectiveTypeSpec(type);
+ string conditionKindExpr = GetConditionKindExpr(ref isFirstType);
+
+ EmitStartBlock($"{conditionKindExpr} ({Identifier.type} == typeof({type.DisplayString}))");
+
+ switch (effectiveType)
+ {
+ case ParsableFromStringSpec stringParsableType:
+ {
+ EmitCastToIConfigurationSection();
+ EmitBindingLogic(
+ stringParsableType,
+ Expression.sectionValue,
+ Expression.sectionPath,
+ writeOnSuccess: parsedValueExpr => _writer.WriteLine($"return {parsedValueExpr};"),
+ checkForNullSectionValue: stringParsableType.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue,
+ useDefaultValueIfSectionValueIsNull: false,
+ useIncrementalStringValueIdentifier: false);
+ }
+ break;
+ case ConfigurationSectionSpec:
+ {
+ EmitCastToIConfigurationSection();
+ _writer.WriteLine($"return {Identifier.section};");
+ }
+ break;
+ case ComplexTypeSpec complexType:
+ {
+ if (_typeIndex.CanInstantiate(complexType))
+ {
+ EmitBindingLogic(complexType, Identifier.instance, Identifier.configuration, InitializationKind.Declaration, ValueDefaulting.CallSetter);
+ _writer.WriteLine($"return {Identifier.instance};");
+ }
+ else if (type is ObjectSpec { InitExceptionMessage: string exMsg })
+ {
+ _writer.WriteLine($@"throw new {Identifier.InvalidOperationException}(""{exMsg}"");");
+ }
+#if DEBUG
+ else
+ {
+ Debug.Fail($"Complex should not be included for GetCore gen: {complexType.DisplayString}");
+ }
+#endif
+ }
+ break;
+ }
+
+ EmitEndBlock(); // End if-check for input type.
+ }
+
+ _writer.WriteLine();
+ Emit_NotSupportedException_TypeNotDetectedAsInput();
+ EmitEndBlock();
+ _emitBlankLineBeforeNextStatement = true;
+
+ void EmitCastToIConfigurationSection() =>
+ _writer.WriteLine($$"""
+ if ({{Identifier.configuration}} is not {{Identifier.IConfigurationSection}} {{Identifier.section}})
+ {
+ throw new {{Identifier.InvalidOperationException}}();
+ }
+ """);
+ }
+
+ private void EmitGetValueCoreMethod()
+ {
+ if (_bindingHelperInfo.TypesForGen_GetValueCore is not { Count: not 0 } targetTypes)
+ {
+ return;
+ }
+
+ EmitBlankLineIfRequired();
+ EmitStartBlock($"public static object? {nameof(MethodsToGen_CoreBindingHelper.GetValueCore)}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}, string {Identifier.key})");
+
+ EmitCheckForNullArgument_WithBlankLine(Identifier.configuration);
+ _writer.WriteLine($@"{Identifier.IConfigurationSection} {Identifier.section} = {GetSectionFromConfigurationExpression(Identifier.key, addQuotes: false)};");
+ _writer.WriteLine();
+
+ _writer.WriteLine($$"""
+ if ({{Expression.sectionValue}} is not string {{Identifier.value}})
+ {
+ return null;
+ }
+ """);
+
+ _writer.WriteLine();
+
+ bool isFirstType = true;
+ foreach (TypeSpec type in targetTypes)
+ {
+ string conditionKindExpr = GetConditionKindExpr(ref isFirstType);
+ EmitStartBlock($"{conditionKindExpr} ({Identifier.type} == typeof({type.DisplayString}))");
+
+ EmitBindingLogic(
+ (ParsableFromStringSpec)_typeIndex.GetEffectiveTypeSpec(type),
+ Identifier.value,
+ Expression.sectionPath,
+ writeOnSuccess: (parsedValueExpr) => _writer.WriteLine($"return {parsedValueExpr};"),
+ checkForNullSectionValue: false,
+ useDefaultValueIfSectionValueIsNull: false,
+ useIncrementalStringValueIdentifier: false);
+
+ EmitEndBlock();
+ }
+
+ _writer.WriteLine();
+ _writer.WriteLine("return null;");
+ EmitEndBlock();
+ _emitBlankLineBeforeNextStatement = true;
+ }
+
+ private void EmitBindCoreMainMethod()
+ {
+ if (_bindingHelperInfo.TypesForGen_BindCoreMain is not { Count: not 0 } targetTypes)
+ {
+ return;
+ }
+
+ EmitBlankLineIfRequired();
+ EmitStartBlock($"public static void {nameof(MethodsToGen_CoreBindingHelper.BindCoreMain)}({Identifier.IConfiguration} {Identifier.configuration}, object {Identifier.instance}, Type {Identifier.type}, {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureOptions})");
+ EmitCheckForNullArgument_WithBlankLine(Identifier.instance, voidReturn: true);
+ EmitIConfigurationHasValueOrChildrenCheck(voidReturn: true);
+ _writer.WriteLine($"{Identifier.BinderOptions}? {Identifier.binderOptions} = {Identifier.GetBinderOptions}({Identifier.configureOptions});");
+ _writer.WriteLine();
+
+ bool isFirstType = true;
+ foreach (ComplexTypeSpec type in targetTypes)
+ {
+ ComplexTypeSpec effectiveType = (ComplexTypeSpec)_typeIndex.GetEffectiveTypeSpec(type);
+ Debug.Assert(_typeIndex.HasBindableMembers(effectiveType));
+ string conditionKindExpr = GetConditionKindExpr(ref isFirstType);
+
+ EmitStartBlock($"{conditionKindExpr} ({Identifier.type} == typeof({type.DisplayString}))");
+ _writer.WriteLine($"var {Identifier.temp} = ({effectiveType.DisplayString}){Identifier.instance};");
+ EmitBindingLogic(type, Identifier.temp, Identifier.configuration, InitializationKind.None, ValueDefaulting.None);
+ _writer.WriteLine($"return;");
+ EmitEndBlock();
+ }
+
+ _writer.WriteLine();
+ Emit_NotSupportedException_TypeNotDetectedAsInput();
+ EmitEndBlock();
+ }
+
+ private void EmitBindCoreMethods()
+ {
+ if (_bindingHelperInfo.TypesForGen_BindCore is not ImmutableEquatableArray types)
+ {
+ return;
+ }
+
+ foreach (ComplexTypeSpec type in types)
+ {
+ Debug.Assert(_typeIndex.HasBindableMembers(type));
+ EmitBlankLineIfRequired();
+ EmitBindCoreMethod(type);
+ }
+ }
+
+ private void EmitBindCoreMethod(ComplexTypeSpec type)
+ {
+ string objParameterExpression = $"ref {type.DisplayString} {Identifier.instance}";
+ EmitStartBlock(@$"public static void {nameof(MethodsToGen_CoreBindingHelper.BindCore)}({Identifier.IConfiguration} {Identifier.configuration}, {objParameterExpression}, bool defaultValueIfNotFound, {Identifier.BinderOptions}? {Identifier.binderOptions})");
+
+ ComplexTypeSpec effectiveType = (ComplexTypeSpec)_typeIndex.GetEffectiveTypeSpec(type);
+
+ switch (effectiveType)
+ {
+ case ArraySpec arrayType:
+ {
+ EmitBindCoreImplForArray(arrayType);
+ }
+ break;
+ case EnumerableSpec enumerableType:
+ {
+ EmitBindCoreImplForEnumerableWithAdd(enumerableType);
+ }
+ break;
+ case DictionarySpec dictionaryType:
+ {
+ EmitBindCoreImplForDictionary(dictionaryType);
+ }
+ break;
+ case ObjectSpec objectType:
+ {
+ EmitBindCoreImplForObject(objectType);
+ }
+ break;
+ default:
+ {
+ Debug.Fail($"Unsupported spec for bind core gen: {effectiveType.GetType()}");
+ }
+ break;
+ }
+
+ EmitEndBlock();
+ }
+
+ private void EmitInitializeMethods()
+ {
+ if (_bindingHelperInfo.TypesForGen_Initialize is not ImmutableEquatableArray types)
+ {
+ return;
+ }
+
+ foreach (ObjectSpec type in types)
+ {
+ EmitBlankLineIfRequired();
+ EmitInitializeMethod(type);
+ }
+ }
+
+ private void EmitInitializeMethod(ObjectSpec type)
+ {
+ Debug.Assert(type.InstantiationStrategy is ObjectInstantiationStrategy.ParameterizedConstructor);
+ Debug.Assert(_typeIndex.CanInstantiate(type));
+ Debug.Assert(
+ type is { Properties: not null, ConstructorParameters: not null },
+ $"Expecting type for init method, {type.DisplayString}, to have both properties and ctor params.");
+
+ IEnumerable initOnlyProps = type.Properties.Where(prop => prop is { SetOnInit: true });
+ List ctorArgList = new();
+ string displayString = type.DisplayString;
+
+ EmitStartBlock($"public static {type.DisplayString} {GetInitalizeMethodDisplayString(type)}({Identifier.IConfiguration} {Identifier.configuration}, {Identifier.BinderOptions}? {Identifier.binderOptions})");
+ _emitBlankLineBeforeNextStatement = false;
+
+ foreach (ParameterSpec parameter in type.ConstructorParameters)
+ {
+ string name = parameter.Name;
+ string argExpr = parameter.RefKind switch
+ {
+ RefKind.None => name,
+ RefKind.Ref => $"ref {name}",
+ RefKind.Out => "out _",
+ RefKind.In => $"in {name}",
+ _ => throw new InvalidOperationException()
+ };
+
+ ctorArgList.Add(argExpr);
+ EmitBindImplForMember(parameter);
+ }
+
+ foreach (PropertySpec property in initOnlyProps)
+ {
+ if (_typeIndex.ShouldBindTo(property) && property.MatchingCtorParam is null)
+ {
+ EmitBindImplForMember(property);
+ }
+ }
+
+ string returnExpression = $"return new {displayString}({string.Join(", ", ctorArgList)})";
+ if (!initOnlyProps.Any())
+ {
+ _writer.WriteLine($"{returnExpression};");
+ }
+ else
+ {
+ EmitStartBlock(returnExpression);
+ foreach (PropertySpec property in initOnlyProps)
+ {
+ string propertyName = property.Name;
+ _writer.WriteLine($@"{propertyName} = {propertyName},");
+ }
+ EmitEndBlock(endBraceTrailingSource: ";");
+ }
+
+ // End method.
+ EmitEndBlock();
+ _emitBlankLineBeforeNextStatement = true;
+
+ void EmitBindImplForMember(MemberSpec member)
+ {
+ TypeSpec memberType = _typeIndex.GetTypeSpec(member.TypeRef);
+ string parsedMemberDeclarationLhs = $"{memberType.DisplayString} {member.Name}";
+ string configKeyName = member.ConfigurationKeyName;
+ string parsedMemberAssignmentLhsExpr;
+
+ switch (memberType)
+ {
+ case ParsableFromStringSpec { StringParsableTypeKind: StringParsableTypeKind.AssignFromSectionValue }:
+ {
+ if (member is ParameterSpec parameter && parameter.ErrorOnFailedBinding)
+ {
+ string condition = $@"if ({Identifier.configuration}[""{configKeyName}""] is not {parsedMemberDeclarationLhs})";
+ EmitThrowBlock(condition);
+ _writer.WriteLine();
+ return;
+ }
+
+ parsedMemberAssignmentLhsExpr = parsedMemberDeclarationLhs;
+ }
+ break;
+ case ConfigurationSectionSpec:
+ {
+ _writer.WriteLine($"{parsedMemberDeclarationLhs} = {GetSectionFromConfigurationExpression(configKeyName)};");
+ return;
+ }
+ default:
+ {
+ string bangExpr = memberType.IsValueType ? string.Empty : "!";
+ string parsedMemberIdentifierDeclaration = $"{parsedMemberDeclarationLhs} = {member.DefaultValueExpr}{bangExpr};";
+
+ _writer.WriteLine(parsedMemberIdentifierDeclaration);
+ _emitBlankLineBeforeNextStatement = false;
+
+ parsedMemberAssignmentLhsExpr = member.Name;
+ }
+ break;
+ }
+
+ bool canBindToMember = this.EmitBindImplForMember(
+ member,
+ parsedMemberAssignmentLhsExpr,
+ sectionPathExpr: GetSectionPathFromConfigurationExpression(configKeyName),
+ canSet: true,
+ InitializationKind.None);
+
+ if (canBindToMember)
+ {
+ if (member is ParameterSpec parameter && parameter.ErrorOnFailedBinding)
+ {
+ // Add exception logic for parameter ctors; must be present in configuration object.
+ EmitThrowBlock(condition: "else");
+ }
+
+ _writer.WriteLine();
+ }
+
+ void EmitThrowBlock(string condition) =>
+ _writer.WriteLine($$"""
+ {{condition}}
+ {
+ throw new {{Identifier.InvalidOperationException}}("{{string.Format(ExceptionMessages.ParameterHasNoMatchingConfig, type.Name, member.Name)}}");
+ }
+ """);
+ }
+ }
+
+ private void EmitHelperMethods()
+ {
+ // Emitted if we are to bind objects with complex members, or if we're emitting BindCoreMain or GetCore methods.
+ bool emitAsConfigWithChildren = ShouldEmitMethods(MethodsToGen_CoreBindingHelper.AsConfigWithChildren);
+
+ if (ShouldEmitMethods(MethodsToGen_CoreBindingHelper.BindCore))
+ {
+ EmitBlankLineIfRequired();
+ EmitValidateConfigurationKeysMethod();
+ }
+
+ if (ShouldEmitMethods(MethodsToGen_CoreBindingHelper.BindCoreMain | MethodsToGen_CoreBindingHelper.GetCore))
+ {
+ // HasValueOrChildren references this method.
+ Debug.Assert(emitAsConfigWithChildren);
+ EmitBlankLineIfRequired();
+ EmitHasValueOrChildrenMethod();
+ }
+
+ if (emitAsConfigWithChildren)
+ {
+ EmitBlankLineIfRequired();
+ EmitAsConfigWithChildrenMethod();
+ }
+
+ if (ShouldEmitMethods(MethodsToGen_CoreBindingHelper.BindCoreMain | MethodsToGen_CoreBindingHelper.GetCore) ||
+ ShouldEmitMethods(MethodsToGen.ConfigBinder_Bind_instance_BinderOptions))
+ {
+ EmitBlankLineIfRequired();
+ EmitGetBinderOptionsHelper();
+ }
+
+ if (_bindingHelperInfo.TypesForGen_ParsePrimitive is { Count: not 0 } stringParsableTypes)
+ {
+ bool enumTypeExists = false;
+
+ foreach (ParsableFromStringSpec type in stringParsableTypes)
+ {
+ EmitBlankLineIfRequired();
+
+ if (type.StringParsableTypeKind == StringParsableTypeKind.Enum)
+ {
+ if (!enumTypeExists)
+ {
+ EmitEnumParseMethod();
+ enumTypeExists = true;
+ }
+ }
+ else
+ {
+ EmitPrimitiveParseMethod(type);
+ }
+ }
+ }
+ }
+
+ private void EmitValidateConfigurationKeysMethod()
+ {
+ const string keysIdentifier = "keys";
+ string exceptionMessage = string.Format(ExceptionMessages.MissingConfig, Identifier.ErrorOnUnknownConfiguration, Identifier.BinderOptions, $"{{{Identifier.type}}}", $@"{{string.Join("", "", {Identifier.temp})}}");
+
+ EmitBlankLineIfRequired();
+ _writer.WriteLine($$"""
+ /// If required by the binder options, validates that there are no unknown keys in the input configuration object.
+ public static void {{Identifier.ValidateConfigurationKeys}}(Type {{Identifier.type}}, {{TypeDisplayString.LazyHashSetOfString}} {{keysIdentifier}}, {{Identifier.IConfiguration}} {{Identifier.configuration}}, {{Identifier.BinderOptions}}? {{Identifier.binderOptions}})
+ {
+ if ({{Identifier.binderOptions}}?.{{Identifier.ErrorOnUnknownConfiguration}} is true)
+ {
+ {{TypeDisplayString.ListOfString}}? {{Identifier.temp}} = null;
+
+ foreach ({{Identifier.IConfigurationSection}} {{Identifier.section}} in {{Identifier.configuration}}.{{Identifier.GetChildren}}())
+ {
+ if (!{{keysIdentifier}}.Value.Contains({{Expression.sectionKey}}))
+ {
+ ({{Identifier.temp}} ??= new {{TypeDisplayString.ListOfString}}()).Add($"'{{{Expression.sectionKey}}}'");
+ }
+ }
+
+ if ({{Identifier.temp}} is not null)
+ {
+ throw new InvalidOperationException($"{{exceptionMessage}}");
+ }
+ }
+ }
+ """);
+ }
+
+ private void EmitHasValueOrChildrenMethod()
+ {
+ _writer.WriteLine($$"""
+ public static bool {{Identifier.HasValueOrChildren}}({{Identifier.IConfiguration}} {{Identifier.configuration}})
+ {
+ if (({{Identifier.configuration}} as {{Identifier.IConfigurationSection}})?.{{Identifier.Value}} is not null)
+ {
+ return true;
+ }
+ return {{MethodsToGen_CoreBindingHelper.AsConfigWithChildren}}({{Identifier.configuration}}) is not null;
+ }
+ """);
+ }
+
+ private void EmitAsConfigWithChildrenMethod()
+ {
+ _writer.WriteLine($$"""
+ public static {{Identifier.IConfiguration}}? {{MethodsToGen_CoreBindingHelper.AsConfigWithChildren}}({{Identifier.IConfiguration}} {{Identifier.configuration}})
+ {
+ foreach ({{Identifier.IConfigurationSection}} _ in {{Identifier.configuration}}.{{Identifier.GetChildren}}())
+ {
+ return {{Identifier.configuration}};
+ }
+ return null;
+ }
+ """);
+ }
+
+ private void EmitGetBinderOptionsHelper()
+ {
+ _writer.WriteLine($$"""
+ public static {{Identifier.BinderOptions}}? {{Identifier.GetBinderOptions}}({{TypeDisplayString.NullableActionOfBinderOptions}} {{Identifier.configureOptions}})
+ {
+ if ({{Identifier.configureOptions}} is null)
+ {
+ return null;
+ }
+
+ {{Identifier.BinderOptions}} {{Identifier.binderOptions}} = new();
+ {{Identifier.configureOptions}}({{Identifier.binderOptions}});
+
+ if ({{Identifier.binderOptions}}.BindNonPublicProperties)
+ {
+ throw new NotSupportedException($"{{string.Format(ExceptionMessages.CannotSpecifyBindNonPublicProperties)}}");
+ }
+
+ return {{Identifier.binderOptions}};
+ }
+ """);
+ }
+
+ private void EmitEnumParseMethod()
+ {
+ string exceptionArg1 = string.Format(ExceptionMessages.FailedBinding, $"{{{Identifier.getPath}()}}", $"{{typeof(T)}}");
+
+ _writer.WriteLine($$"""
+ public static T ParseEnum(string value, Func getPath) where T : struct
+ {
+ try
+ {
+ #if NETFRAMEWORK || NETSTANDARD2_0
+ return (T)Enum.Parse(typeof(T), value, ignoreCase: true);
+ #else
+ return Enum.Parse(value, ignoreCase: true);
+ #endif
+ }
+ catch ({{Identifier.Exception}} {{Identifier.exception}})
+ {
+ throw new {{Identifier.InvalidOperationException}}($"{{exceptionArg1}}", {{Identifier.exception}});
+ }
+ }
+ """);
+ }
+
+ private void EmitPrimitiveParseMethod(ParsableFromStringSpec type)
+ {
+ StringParsableTypeKind typeKind = type.StringParsableTypeKind;
+ string typeDisplayString = type.DisplayString;
+
+ string invariantCultureExpression = $"{Identifier.CultureInfo}.InvariantCulture";
+ string parsedValueExpr;
+
+ switch (typeKind)
+ {
+ case StringParsableTypeKind.Enum:
+ return;
+ case StringParsableTypeKind.ByteArray:
+ {
+ parsedValueExpr = $"Convert.FromBase64String({Identifier.value})";
+ }
+ break;
+ case StringParsableTypeKind.Integer:
+ {
+ parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value}, {Identifier.NumberStyles}.Integer, {invariantCultureExpression})";
+ }
+ break;
+ case StringParsableTypeKind.Float:
+ {
+ parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value}, {Identifier.NumberStyles}.Float, {invariantCultureExpression})";
+ }
+ break;
+ case StringParsableTypeKind.Parse:
+ {
+ parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value})";
+ }
+ break;
+ case StringParsableTypeKind.ParseInvariant:
+ {
+ parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value}, {invariantCultureExpression})"; ;
+ }
+ break;
+ case StringParsableTypeKind.CultureInfo:
+ {
+ parsedValueExpr = $"{Identifier.CultureInfo}.GetCultureInfo({Identifier.value})";
+ }
+ break;
+ case StringParsableTypeKind.Uri:
+ {
+ parsedValueExpr = $"new Uri({Identifier.value}, UriKind.RelativeOrAbsolute)";
+ }
+ break;
+ default:
+ {
+ Debug.Fail($"Invalid string parsable kind: {typeKind}");
+ return;
+ }
+ }
+
+ string exceptionArg1 = string.Format(ExceptionMessages.FailedBinding, $"{{{Identifier.getPath}()}}", $"{{typeof({typeDisplayString})}}");
+
+ EmitStartBlock($"public static {typeDisplayString} {TypeIndex.GetParseMethodName(type)}(string {Identifier.value}, Func {Identifier.getPath})");
+ EmitEndBlock($$"""
+ try
+ {
+ return {{parsedValueExpr}};
+ }
+ catch ({{Identifier.Exception}} {{Identifier.exception}})
+ {
+ throw new {{Identifier.InvalidOperationException}}($"{{exceptionArg1}}", {{Identifier.exception}});
+ }
+ """);
+ }
+
+ private void EmitBindCoreImplForArray(ArraySpec type)
+ {
+ TypeRef elementTypeRef = type.ElementTypeRef;
+ string elementTypeDisplayString = _typeIndex.GetTypeSpec(elementTypeRef).DisplayString;
+ string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
+
+ // Create temp list.
+ _writer.WriteLine($"var {tempIdentifier} = new List<{elementTypeDisplayString}>();");
+ _writer.WriteLine();
+
+ // Bind elements to temp list.
+ EmitBindingLogicForEnumerableWithAdd(elementTypeRef, tempIdentifier);
+ _writer.WriteLine();
+
+ // Resize array and add binded elements.
+ _writer.WriteLine($$"""
+ {{Identifier.Int32}} {{Identifier.originalCount}} = {{Identifier.instance}}.{{Identifier.Length}};
+ {{Identifier.Array}}.{{Identifier.Resize}}(ref {{Identifier.instance}}, {{Identifier.originalCount}} + {{tempIdentifier}}.{{Identifier.Count}});
+ {{tempIdentifier}}.{{Identifier.CopyTo}}({{Identifier.instance}}, {{Identifier.originalCount}});
+ """);
+ }
+
+ private void EmitBindCoreImplForEnumerableWithAdd(EnumerableSpec type)
+ {
+ EmitCollectionCastIfRequired(type, out string instanceIdentifier);
+ EmitBindingLogicForEnumerableWithAdd(type.ElementTypeRef, instanceIdentifier);
+ }
+
+ private void EmitBindingLogicForEnumerableWithAdd(TypeRef elementTypeRef, string enumerableIdentifier)
+ {
+ Emit_Foreach_Section_In_ConfigChildren_StartBlock();
+
+ string addExpr = $"{enumerableIdentifier}.{Identifier.Add}";
+
+ switch (_typeIndex.GetEffectiveTypeSpec(elementTypeRef))
+ {
+ case ParsableFromStringSpec stringParsableType:
+ {
+ EmitBindingLogic(
+ stringParsableType,
+ Expression.sectionValue,
+ Expression.sectionPath,
+ (parsedValueExpr) => _writer.WriteLine($"{addExpr}({parsedValueExpr});"),
+ checkForNullSectionValue: true,
+ useDefaultValueIfSectionValueIsNull: false,
+ useIncrementalStringValueIdentifier: false);
+ }
+ break;
+ case ConfigurationSectionSpec:
+ {
+ _writer.WriteLine($"{addExpr}({Identifier.section});");
+ }
+ break;
+ case ComplexTypeSpec complexType when _typeIndex.CanInstantiate(complexType):
+ {
+ EmitBindingLogic(complexType, Identifier.value, Identifier.section, InitializationKind.Declaration, ValueDefaulting.None);
+ _writer.WriteLine($"{addExpr}({Identifier.value});");
+ }
+ break;
+ }
+
+ EmitEndBlock();
+ }
+
+ private void EmitBindCoreImplForDictionary(DictionarySpec type)
+ {
+ EmitCollectionCastIfRequired(type, out string instanceIdentifier);
+
+ Emit_Foreach_Section_In_ConfigChildren_StartBlock();
+
+ ParsableFromStringSpec keyType = (ParsableFromStringSpec)_typeIndex.GetEffectiveTypeSpec(type.KeyTypeRef);
+ TypeSpec elementType = _typeIndex.GetTypeSpec(type.ElementTypeRef);
+
+ // Parse key
+ EmitBindingLogic(
+ keyType,
+ Expression.sectionKey,
+ Expression.sectionPath,
+ Emit_BindAndAddLogic_ForElement,
+ checkForNullSectionValue: false,
+ useDefaultValueIfSectionValueIsNull: false,
+ useIncrementalStringValueIdentifier: false);
+
+ void Emit_BindAndAddLogic_ForElement(string parsedKeyExpr)
+ {
+ switch (elementType)
+ {
+ case ParsableFromStringSpec stringParsableElementType:
+ {
+ EmitBindingLogic(
+ stringParsableElementType,
+ Expression.sectionValue,
+ Expression.sectionPath,
+ writeOnSuccess: parsedValueExpr => _writer.WriteLine($"{instanceIdentifier}[{parsedKeyExpr}] = {parsedValueExpr};"),
+ checkForNullSectionValue: true,
+ useDefaultValueIfSectionValueIsNull: false,
+ useIncrementalStringValueIdentifier: false);
+ }
+ break;
+ case ConfigurationSectionSpec:
+ {
+ _writer.WriteLine($"{instanceIdentifier}[{parsedKeyExpr}] = {Identifier.section};");
+ }
+ break;
+ case ComplexTypeSpec complexElementType:
+ {
+ if (keyType.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue)
+ {
+ // Save value to local to avoid parsing twice - during look-up and during add.
+ _writer.WriteLine($"{keyType.DisplayString} {Identifier.key} = {parsedKeyExpr};");
+ parsedKeyExpr = Identifier.key;
+ }
+
+ bool isValueType = complexElementType.IsValueType;
+ string expressionForElementIsNotNull = $"{Identifier.element} is not null";
+ string elementTypeDisplayString = complexElementType.DisplayString + (complexElementType.IsValueType ? string.Empty : "?");
+
+ string expressionForElementExists = $"{instanceIdentifier}.{Identifier.TryGetValue}({parsedKeyExpr}, out {elementTypeDisplayString} {Identifier.element})";
+ string conditionToUseExistingElement = expressionForElementExists;
+
+ // If key already exists, bind to existing element instance if not null (for ref types).
+ if (!isValueType)
+ {
+ conditionToUseExistingElement += $" && {expressionForElementIsNotNull}";
+ }
+
+ if (_typeIndex.CanInstantiate(complexElementType))
+ {
+ EmitStartBlock($"if (!({conditionToUseExistingElement}))");
+ EmitObjectInit(complexElementType, Identifier.element, InitializationKind.SimpleAssignment, Identifier.section);
+ EmitEndBlock();
+
+ EmitBindingLogic();
+ }
+ else
+ {
+ EmitStartBlock($"if ({conditionToUseExistingElement})");
+ EmitBindingLogic();
+ EmitEndBlock();
+ }
+
+ void EmitBindingLogic()
+ {
+ this.EmitBindingLogic(
+ complexElementType,
+ Identifier.element,
+ Identifier.section,
+ InitializationKind.None,
+ ValueDefaulting.None);
+
+ _writer.WriteLine($"{instanceIdentifier}[{parsedKeyExpr}] = {Identifier.element};");
+ }
+ }
+ break;
+ }
+ }
+
+ EmitEndBlock();
+ }
+
+ private void EmitBindCoreImplForObject(ObjectSpec type)
+ {
+ Debug.Assert(_typeIndex.HasBindableMembers(type));
+
+ string keyCacheFieldName = TypeIndex.GetConfigKeyCacheFieldName(type);
+ string validateMethodCallExpr = $"{Identifier.ValidateConfigurationKeys}(typeof({type.DisplayString}), {keyCacheFieldName}, {Identifier.configuration}, {Identifier.binderOptions});";
+ _writer.WriteLine(validateMethodCallExpr);
+
+ foreach (PropertySpec property in type.Properties!)
+ {
+ if (_typeIndex.ShouldBindTo(property))
+ {
+ string containingTypeRef = property.IsStatic ? type.DisplayString : Identifier.instance;
+ EmitBindImplForMember(
+ property,
+ memberAccessExpr: $"{containingTypeRef}.{property.Name}",
+ GetSectionPathFromConfigurationExpression(property.ConfigurationKeyName),
+ canSet: property.CanSet,
+ InitializationKind.Declaration);
+ }
+ }
+ }
+
+ private bool EmitBindImplForMember(
+ MemberSpec member,
+ string memberAccessExpr,
+ string sectionPathExpr,
+ bool canSet,
+ InitializationKind initializationKind)
+ {
+ string sectionParseExpr = GetSectionFromConfigurationExpression(member.ConfigurationKeyName);
+
+ switch (_typeIndex.GetEffectiveTypeSpec(member.TypeRef))
+ {
+ case ParsableFromStringSpec stringParsableType:
+ {
+ if (canSet)
+ {
+ bool useDefaultValueIfSectionValueIsNull =
+ initializationKind == InitializationKind.Declaration &&
+ member is PropertySpec &&
+ member.TypeRef.IsValueType &&
+ _typeIndex.GetTypeSpec(member.TypeRef) is not NullableSpec;
+
+ EmitBlankLineIfRequired();
+ EmitBindingLogic(
+ stringParsableType,
+ $@"{Identifier.configuration}[""{member.ConfigurationKeyName}""]",
+ sectionPathExpr,
+ writeOnSuccess: parsedValueExpr => _writer.WriteLine($"{memberAccessExpr} = {parsedValueExpr};"),
+ checkForNullSectionValue: true,
+ useDefaultValueIfSectionValueIsNull,
+ useIncrementalStringValueIdentifier: true);
+ }
+
+ return true;
+ }
+ case ConfigurationSectionSpec:
+ {
+ if (canSet)
+ {
+ EmitBlankLineIfRequired();
+ _writer.WriteLine($"{memberAccessExpr} = {sectionParseExpr};");
+ }
+
+ return true;
+ }
+ case ComplexTypeSpec complexType:
+ {
+ string sectionValidationCall = $"{MethodsToGen_CoreBindingHelper.AsConfigWithChildren}({sectionParseExpr})";
+ string sectionIdentifier = GetIncrementalIdentifier(Identifier.section);
+
+ EmitBlankLineIfRequired();
+ EmitStartBlock($"if ({sectionValidationCall} is {Identifier.IConfigurationSection} {sectionIdentifier})");
+ EmitBindingLogicForComplexMember(member, memberAccessExpr, sectionIdentifier, canSet);
+ EmitEndBlock();
+
+ return _typeIndex.CanInstantiate(complexType);
+ }
+ default:
+ return false;
+ }
+ }
+
+ private void EmitBindingLogicForComplexMember(
+ MemberSpec member,
+ string memberAccessExpr,
+ string configArgExpr,
+ bool canSet)
+ {
+
+ TypeSpec memberType = _typeIndex.GetTypeSpec(member.TypeRef);
+ ComplexTypeSpec effectiveMemberType = (ComplexTypeSpec)_typeIndex.GetEffectiveTypeSpec(memberType);
+
+ string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
+ InitializationKind initKind;
+ string targetObjAccessExpr;
+
+ if (effectiveMemberType.IsValueType)
+ {
+ if (!canSet)
+ {
+ return;
+ }
+
+ Debug.Assert(canSet);
+ string effectiveMemberTypeDisplayString = effectiveMemberType.DisplayString;
+ initKind = InitializationKind.None;
+
+ if (memberType is NullableSpec)
+ {
+ string nullableTempIdentifier = GetIncrementalIdentifier(Identifier.temp);
+
+ _writer.WriteLine($"{memberType.DisplayString} {nullableTempIdentifier} = {memberAccessExpr};");
+
+ _writer.WriteLine(
+ $"{effectiveMemberTypeDisplayString} {tempIdentifier} = {nullableTempIdentifier}.{Identifier.HasValue} ? {nullableTempIdentifier}.{Identifier.Value} : new {effectiveMemberTypeDisplayString}();");
+ }
+ else
+ {
+ _writer.WriteLine($"{effectiveMemberTypeDisplayString} {tempIdentifier} = {memberAccessExpr};");
+ }
+
+ targetObjAccessExpr = tempIdentifier;
+ }
+ else if (member.CanGet)
+ {
+ targetObjAccessExpr = memberAccessExpr;
+ initKind = InitializationKind.AssignmentWithNullCheck;
+ }
+ else
+ {
+ targetObjAccessExpr = memberAccessExpr;
+ initKind = InitializationKind.SimpleAssignment;
+ }
+
+ Action? writeOnSuccess = !canSet
+ ? null
+ : bindedValueIdentifier =>
+ {
+ if (memberAccessExpr != bindedValueIdentifier)
+ {
+ _writer.WriteLine($"{memberAccessExpr} = {bindedValueIdentifier};");
+ }
+ };
+
+ EmitBindingLogic(
+ effectiveMemberType,
+ targetObjAccessExpr,
+ configArgExpr,
+ initKind,
+ ValueDefaulting.None,
+ writeOnSuccess
+ );
+ }
+
+ private void EmitBindingLogic(
+ ComplexTypeSpec type,
+ string memberAccessExpr,
+ string configArgExpr,
+ InitializationKind initKind,
+ ValueDefaulting valueDefaulting,
+ Action? writeOnSuccess = null)
+ {
+ if (!_typeIndex.HasBindableMembers(type))
+ {
+ if (initKind is not InitializationKind.None)
+ {
+ if (_typeIndex.CanInstantiate(type))
+ {
+ EmitObjectInit(type, memberAccessExpr, initKind, configArgExpr);
+ }
+ else if (type is ObjectSpec { InitExceptionMessage: string exMsg })
+ {
+ _writer.WriteLine($@"throw new {Identifier.InvalidOperationException}(""{exMsg}"");");
+ }
+ }
+
+ return;
+ }
+
+ string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
+ if (initKind is InitializationKind.AssignmentWithNullCheck)
+ {
+ Debug.Assert(!type.IsValueType);
+ _writer.WriteLine($"{type.DisplayString}? {tempIdentifier} = {memberAccessExpr};");
+ EmitBindingLogic(tempIdentifier, InitializationKind.AssignmentWithNullCheck);
+ }
+ else if (initKind is InitializationKind.None && type.IsValueType)
+ {
+ EmitBindingLogic(tempIdentifier, InitializationKind.Declaration);
+ _writer.WriteLine($"{memberAccessExpr} = {tempIdentifier};");
+ }
+ else
+ {
+ EmitBindingLogic(memberAccessExpr, initKind);
+ }
+
+ void EmitBindingLogic(string instanceToBindExpr, InitializationKind initKind)
+ {
+ string bindCoreCall = $@"{nameof(MethodsToGen_CoreBindingHelper.BindCore)}({configArgExpr}, ref {instanceToBindExpr}, defaultValueIfNotFound: {FormatDefaultValueIfNotFound()}, {Identifier.binderOptions});";
+
+ if (_typeIndex.CanInstantiate(type))
+ {
+ if (initKind is not InitializationKind.None)
+ {
+ EmitObjectInit(type, instanceToBindExpr, initKind, configArgExpr);
+ }
+
+ EmitBindCoreCall();
+ }
+ else
+ {
+ Debug.Assert(!type.IsValueType);
+
+ if (type is ObjectSpec { InitExceptionMessage: string exMsg })
+ {
+ _writer.WriteLine($@"throw new {Identifier.InvalidOperationException}(""{exMsg}"");");
+ }
+ else
+ {
+ EmitStartBlock($"if ({instanceToBindExpr} is not null)");
+ EmitBindCoreCall();
+ EmitEndBlock();
+ }
+ }
+
+ void EmitBindCoreCall()
+ {
+ _writer.WriteLine(bindCoreCall);
+ writeOnSuccess?.Invoke(instanceToBindExpr);
+ }
+
+ string FormatDefaultValueIfNotFound() => valueDefaulting == ValueDefaulting.CallSetter ? "true" : "false";
+ }
+ }
+
+ private void EmitBindingLogic(
+ ParsableFromStringSpec type,
+ string sectionValueExpr,
+ string sectionPathExpr,
+ Action? writeOnSuccess,
+ bool checkForNullSectionValue,
+ bool useDefaultValueIfSectionValueIsNull,
+ bool useIncrementalStringValueIdentifier)
+ {
+ StringParsableTypeKind typeKind = type.StringParsableTypeKind;
+ Debug.Assert(typeKind is not StringParsableTypeKind.None);
+
+ string nonNull_StringValue_Identifier = useIncrementalStringValueIdentifier ? GetIncrementalIdentifier(Identifier.value) : Identifier.value;
+ string stringValueToParse_Expr = checkForNullSectionValue ? nonNull_StringValue_Identifier : sectionValueExpr;
+ string parsedValueExpr = typeKind switch
+ {
+ StringParsableTypeKind.AssignFromSectionValue => stringValueToParse_Expr,
+ StringParsableTypeKind.Enum => $"ParseEnum<{type.DisplayString}>({stringValueToParse_Expr}, () => {sectionPathExpr})",
+ _ => $"{TypeIndex.GetParseMethodName(type)}({stringValueToParse_Expr}, () => {sectionPathExpr})",
+ };
+
+ if (!checkForNullSectionValue)
+ {
+ InvokeWriteOnSuccess();
+ }
+ else
+ {
+ EmitStartBlock($"if ({sectionValueExpr} is string {nonNull_StringValue_Identifier})");
+ InvokeWriteOnSuccess();
+ EmitEndBlock();
+ }
+
+ if (useDefaultValueIfSectionValueIsNull)
+ {
+ parsedValueExpr = $"default";
+ EmitStartBlock($"else if (defaultValueIfNotFound)");
+ InvokeWriteOnSuccess();
+ EmitEndBlock();
+ }
+
+ void InvokeWriteOnSuccess() => writeOnSuccess?.Invoke(parsedValueExpr);
+ }
+
+ private bool EmitObjectInit(ComplexTypeSpec type, string memberAccessExpr, InitializationKind initKind, string configArgExpr)
+ {
+ CollectionSpec? collectionType = type as CollectionSpec;
+ ObjectSpec? objectType = type as ObjectSpec;
+
+ string? castExpr = null;
+ string initExpr;
+
+ string effectiveDisplayString = type.DisplayString;
+ if (collectionType is not null)
+ {
+ if (collectionType is ArraySpec)
+ {
+ initExpr = $"new {s_arrayBracketsRegex.Replace(effectiveDisplayString, "[0]", 1)}";
+ }
+ else
+ {
+ CollectionWithCtorInitSpec collectionWithCtorInitType = (CollectionWithCtorInitSpec)collectionType;
+
+ if (collectionWithCtorInitType.InstantiationConcreteType is not CollectionInstantiationConcreteType.Self)
+ {
+ castExpr = $"({collectionWithCtorInitType.DisplayString})";
+ }
+
+ effectiveDisplayString = _typeIndex.GetInstantiationTypeDisplayString(collectionWithCtorInitType);
+ initExpr = $"{castExpr}new {effectiveDisplayString}()";
+ }
+ }
+ else
+ {
+ Debug.Assert(objectType is not null);
+ ObjectInstantiationStrategy strategy = objectType.InstantiationStrategy;
+
+ if (strategy is ObjectInstantiationStrategy.ParameterlessConstructor)
+ {
+ initExpr = $"new {effectiveDisplayString}()";
+ }
+ else
+ {
+ Debug.Assert(strategy is ObjectInstantiationStrategy.ParameterizedConstructor);
+ string initMethodIdentifier = GetInitalizeMethodDisplayString(((ObjectSpec)type));
+ initExpr = $"{initMethodIdentifier}({configArgExpr}, {Identifier.binderOptions})";
+ }
+ }
+
+ switch (initKind)
+ {
+ case InitializationKind.Declaration:
+ {
+ Debug.Assert(!memberAccessExpr.Contains('.'));
+ _writer.WriteLine($"var {memberAccessExpr} = {initExpr};");
+ }
+ break;
+ case InitializationKind.AssignmentWithNullCheck:
+ {
+
+ if (collectionType is CollectionWithCtorInitSpec
+ {
+ InstantiationStrategy: CollectionInstantiationStrategy.CopyConstructor or CollectionInstantiationStrategy.LinqToDictionary
+ } collectionWithCtorInitType)
+ {
+ string assignmentValueIfMemberNull = collectionWithCtorInitType.InstantiationStrategy is CollectionInstantiationStrategy.CopyConstructor
+ ? $"new {effectiveDisplayString}({memberAccessExpr})"
+ : $"{memberAccessExpr}.ToDictionary(pair => pair.Key, pair => pair.Value)";
+
+ Debug.Assert(castExpr is not null || collectionWithCtorInitType.InstantiationConcreteType is CollectionInstantiationConcreteType.Self);
+ assignmentValueIfMemberNull = $"{castExpr}{assignmentValueIfMemberNull}";
+
+ _writer.WriteLine($"{memberAccessExpr} = {memberAccessExpr} is null ? {initExpr} : {assignmentValueIfMemberNull};");
+ }
+ else
+ {
+ _writer.WriteLine($"{memberAccessExpr} ??= {initExpr};");
+ }
+ }
+ break;
+ case InitializationKind.SimpleAssignment:
+ {
+ _writer.WriteLine($"{memberAccessExpr} = {initExpr};");
+ }
+ break;
+ default:
+ {
+ Debug.Fail($"Invaild initialization kind: {initKind}");
+ }
+ break;
+ }
+
+ return true;
+ }
+
+ private void EmitIConfigurationHasValueOrChildrenCheck(bool voidReturn)
+ {
+ string returnPostfix = voidReturn ? string.Empty : " null";
+ _writer.WriteLine($$"""
+ if (!{{Identifier.HasValueOrChildren}}({{Identifier.configuration}}))
+ {
+ return{{returnPostfix}};
+ }
+ """);
+ _writer.WriteLine();
+ }
+
+ private void EmitCollectionCastIfRequired(CollectionWithCtorInitSpec type, out string instanceIdentifier)
+ {
+ if (type.PopulationCastType is CollectionPopulationCastType.NotApplicable)
+ {
+ instanceIdentifier = Identifier.instance;
+ return;
+ }
+
+ string castTypeDisplayString = _typeIndex.GetPopulationCastTypeDisplayString(type);
+ instanceIdentifier = Identifier.temp;
+
+ _writer.WriteLine($$"""
+ if ({{Identifier.instance}} is not {{castTypeDisplayString}} {{instanceIdentifier}})
+ {
+ return;
+ }
+ """);
+ _writer.WriteLine();
+
+ }
+
+ private void Emit_Foreach_Section_In_ConfigChildren_StartBlock() =>
+ EmitStartBlock($"foreach ({Identifier.IConfigurationSection} {Identifier.section} in {Identifier.configuration}.{Identifier.GetChildren}())");
+
+ private void Emit_NotSupportedException_TypeNotDetectedAsInput() =>
+ _writer.WriteLine(@$"throw new NotSupportedException($""{string.Format(ExceptionMessages.TypeNotDetectedAsInput, "{type}")}"");");
+
+ private static string GetSectionPathFromConfigurationExpression(string configurationKeyName)
+ => $@"{GetSectionFromConfigurationExpression(configurationKeyName)}.{Identifier.Path}";
+
+ private static string GetSectionFromConfigurationExpression(string configurationKeyName, bool addQuotes = true)
+ {
+ string argExpr = addQuotes ? $@"""{configurationKeyName}""" : configurationKeyName;
+ return $@"{Identifier.configuration}.{Identifier.GetSection}({argExpr})";
+ }
+
+ private static string GetConditionKindExpr(ref bool isFirstType)
+ {
+ if (isFirstType)
+ {
+ isFirstType = false;
+ return "if";
+ }
+
+ return "else if";
+ }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/ExceptionMessages.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/ExceptionMessages.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/ExceptionMessages.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/ExceptionMessages.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/Helpers.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/Helpers.cs
similarity index 60%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/Helpers.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/Helpers.cs
index e0e6a36aabaa7c..34a97d3c64c76c 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/Helpers.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/Helpers.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System.Collections.Generic;
using System.Diagnostics;
using System.Reflection;
@@ -10,7 +11,9 @@ public sealed partial class ConfigurationBindingGenerator
{
private sealed partial class Emitter
{
- private static readonly AssemblyName s_assemblyName = typeof(Emitter).Assembly.GetName();
+ internal static readonly AssemblyName s_assemblyName = typeof(ConfigurationBindingGenerator).Assembly.GetName();
+
+ private string? _emittedExtsTargetType;
private enum InitializationKind
{
@@ -19,6 +22,24 @@ private enum InitializationKind
AssignmentWithNullCheck = 2,
Declaration = 3,
}
+
+ ///
+ /// The type of defaulting for a property if it does not have a config entry.
+ /// This should only be applied for "Get" cases, not "Bind" and is also conditioned
+ /// on the source generated for a particular property as to whether it uses this value.
+ /// Note this is different than "InitializationKind.Declaration" since it only applied to
+ /// complex types and not arrays\enumerables.
+ ///
+ private enum ValueDefaulting
+ {
+ None = 0,
+
+ ///
+ /// Call the setter with the default value for the property's Type.
+ ///
+ CallSetter = 1,
+ }
+
private static class Expression
{
public const string configurationGetSection = "configuration.GetSection";
@@ -26,29 +47,13 @@ private static class Expression
public const string sectionPath = "section.Path";
public const string sectionValue = "section.Value";
- public const string GetBinderOptions = $"{FullyQualifiedDisplayString.CoreBindingHelper}.{Identifier.GetBinderOptions}";
+ public static string GeneratedCodeAnnotation = $@"[GeneratedCode(""{s_assemblyName.Name}"", ""{s_assemblyName.Version}"")]";
}
- private static class FullyQualifiedDisplayString
- {
- public const string ActionOfBinderOptions = $"global::System.Action";
- public const string AddSingleton = $"{ServiceCollectionServiceExtensions}.AddSingleton";
- public const string ConfigurationChangeTokenSource = "global::Microsoft.Extensions.Options.ConfigurationChangeTokenSource";
- public const string CoreBindingHelper = $"global::{ProjectName}.{Identifier.CoreBindingHelper}";
- public const string IConfiguration = "global::Microsoft.Extensions.Configuration.IConfiguration";
- public const string IConfigurationSection = IConfiguration + "Section";
- public const string IOptionsChangeTokenSource = "global::Microsoft.Extensions.Options.IOptionsChangeTokenSource";
- public const string InvalidOperationException = "global::System.InvalidOperationException";
- public const string IServiceCollection = "global::Microsoft.Extensions.DependencyInjection.IServiceCollection";
- public const string NotSupportedException = "global::System.NotSupportedException";
- public const string OptionsBuilderOfTOptions = $"global::Microsoft.Extensions.Options.OptionsBuilder<{Identifier.TOptions}>";
- public const string ServiceCollectionServiceExtensions = "global::Microsoft.Extensions.DependencyInjection.ServiceCollectionServiceExtensions";
- public const string Type = $"global::System.Type";
- }
-
- private static class MinimalDisplayString
+ private static class TypeDisplayString
{
public const string NullableActionOfBinderOptions = "Action?";
+ public const string OptionsBuilderOfTOptions = $"OptionsBuilder<{Identifier.TOptions}>";
public const string HashSetOfString = "HashSet";
public const string LazyHashSetOfString = "Lazy>";
public const string ListOfString = "List";
@@ -57,6 +62,8 @@ private static class MinimalDisplayString
private static class Identifier
{
public const string binderOptions = nameof(binderOptions);
+ public const string config = nameof(config);
+ public const string configureBinder = nameof(configureBinder);
public const string configureOptions = nameof(configureOptions);
public const string configuration = nameof(configuration);
public const string configSectionPath = nameof(configSectionPath);
@@ -67,7 +74,7 @@ private static class Identifier
public const string getPath = nameof(getPath);
public const string key = nameof(key);
public const string name = nameof(name);
- public const string obj = nameof(obj);
+ public const string instance = nameof(instance);
public const string optionsBuilder = nameof(optionsBuilder);
public const string originalCount = nameof(originalCount);
public const string section = nameof(section);
@@ -75,6 +82,7 @@ private static class Identifier
public const string services = nameof(services);
public const string temp = nameof(temp);
public const string type = nameof(type);
+ public const string typedObj = nameof(typedObj);
public const string validateKeys = nameof(validateKeys);
public const string value = nameof(value);
@@ -82,21 +90,19 @@ private static class Identifier
public const string AddSingleton = nameof(AddSingleton);
public const string Any = nameof(Any);
public const string Array = nameof(Array);
- public const string AsConfigWithChildren = nameof(AsConfigWithChildren);
public const string Bind = nameof(Bind);
public const string BinderOptions = nameof(BinderOptions);
+ public const string BindingExtensions = nameof(BindingExtensions);
+ public const string ConfigurationChangeTokenSource = nameof(ConfigurationChangeTokenSource);
public const string Configure = nameof(Configure);
public const string CopyTo = nameof(CopyTo);
public const string ContainsKey = nameof(ContainsKey);
- public const string CoreBindingHelper = nameof(CoreBindingHelper);
public const string Count = nameof(Count);
public const string CultureInfo = nameof(CultureInfo);
public const string CultureNotFoundException = nameof(CultureNotFoundException);
public const string Enum = nameof(Enum);
public const string ErrorOnUnknownConfiguration = nameof(ErrorOnUnknownConfiguration);
- public const string GeneratedConfigurationBinder = nameof(GeneratedConfigurationBinder);
- public const string GeneratedOptionsBuilderBinder = nameof(GeneratedOptionsBuilderBinder);
- public const string GeneratedServiceCollectionBinder = nameof(GeneratedServiceCollectionBinder);
+ public const string Exception = nameof(Exception);
public const string Get = nameof(Get);
public const string GetBinderOptions = nameof(GetBinderOptions);
public const string GetChildren = nameof(GetChildren);
@@ -108,9 +114,13 @@ private static class Identifier
public const string IConfiguration = nameof(IConfiguration);
public const string IConfigurationSection = nameof(IConfigurationSection);
public const string Int32 = "int";
+ public const string InterceptsLocation = nameof(InterceptsLocation);
public const string InvalidOperationException = nameof(InvalidOperationException);
public const string InvariantCulture = nameof(InvariantCulture);
+ public const string IOptionsChangeTokenSource = nameof(IOptionsChangeTokenSource);
+ public const string IServiceCollection = nameof(IServiceCollection);
public const string Length = nameof(Length);
+ public const string NumberStyles = nameof(NumberStyles);
public const string Parse = nameof(Parse);
public const string Path = nameof(Path);
public const string Resize = nameof(Resize);
@@ -118,16 +128,64 @@ private static class Identifier
public const string TOptions = nameof(TOptions);
public const string TryCreate = nameof(TryCreate);
public const string TryGetValue = nameof(TryGetValue);
- public const string TryParse = nameof(TryParse);
+ public const string Type = nameof(Type);
public const string Uri = nameof(Uri);
public const string ValidateConfigurationKeys = nameof(ValidateConfigurationKeys);
public const string Value = nameof(Value);
}
- private bool ShouldEmitBinders() =>
- ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Any) ||
- ShouldEmitMethods(MethodsToGen_Extensions_OptionsBuilder.Any) ||
- ShouldEmitMethods(MethodsToGen_Extensions_ServiceCollection.Any);
+ private bool ShouldEmitMethods(MethodsToGen methods) => (_interceptorInfo.MethodsToGen & methods) != 0;
+
+ private void EmitInterceptsLocationAnnotations(MethodsToGen overload)
+ {
+ IEnumerable? infoList = _interceptorInfo.GetInfo(overload);
+ bool interceptsCalls = infoList is not null;
+
+ // The only time a generated binding method won't have any locations to
+ // intercept is when either of these methods are used as helpers for
+ // other generated OptionsBuilder or ServiceCollection binding extensions.
+ Debug.Assert(interceptsCalls ||
+ overload is MethodsToGen.ServiceCollectionExt_Configure_T_name_BinderOptions ||
+ overload is MethodsToGen.OptionsBuilderExt_Bind_T_BinderOptions);
+
+ if (interceptsCalls)
+ {
+ EmitInterceptsLocationAnnotations(infoList!);
+ }
+ }
+
+ private void EmitInterceptsLocationAnnotations(IEnumerable infoList)
+ {
+ foreach (InvocationLocationInfo info in infoList)
+ {
+ _writer.WriteLine($@"[{Identifier.InterceptsLocation}(@""{info.FilePath}"", {info.LineNumber}, {info.CharacterNumber})]");
+ }
+ }
+
+ private void EmitBindingExtStartRegion(string targetType)
+ {
+ Debug.Assert(_emittedExtsTargetType is null);
+
+ EmitBlankLineIfRequired();
+ _emittedExtsTargetType = targetType;
+ EmitBindingExtRegionText(isStart: true);
+ _emitBlankLineBeforeNextStatement = false;
+ }
+
+ private void EmitBindingExtEndRegion()
+ {
+ Debug.Assert(_emittedExtsTargetType is not null);
+
+ EmitBindingExtRegionText(isStart: false);
+ _emittedExtsTargetType = null;
+ _emitBlankLineBeforeNextStatement = true;
+ }
+
+ private void EmitBindingExtRegionText(bool isStart)
+ {
+ string endSource = isStart ? string.Empty : "end";
+ _writer.WriteLine($"#{endSource}region {_emittedExtsTargetType} extensions.");
+ }
///
/// Starts a block of source code.
@@ -171,81 +229,26 @@ private void EmitBlankLineIfRequired()
_emitBlankLineBeforeNextStatement = true;
}
- private void EmitCheckForNullArgument_WithBlankLine_IfRequired(bool isValueType)
+ private void EmitCheckForNullArgument_WithBlankLine(string paramName, bool voidReturn = false)
{
- if (!isValueType)
- {
- EmitCheckForNullArgument_WithBlankLine(Identifier.obj);
- }
- }
-
- private void EmitCheckForNullArgument_WithBlankLine(string paramName)
- {
- string exceptionTypeDisplayString = _useFullyQualifiedNames
- ? "global::System.ArgumentNullException"
- : "ArgumentNullException";
+ string returnExpr = voidReturn
+ ? "return"
+ : $"throw new ArgumentNullException(nameof({paramName}))";
_writer.WriteLine($$"""
if ({{paramName}} is null)
{
- throw new {{exceptionTypeDisplayString}}(nameof({{paramName}}));
+ {{returnExpr}};
}
""");
_writer.WriteLine();
}
- private bool EmitInitException(TypeSpec type)
- {
- Debug.Assert(type.InitializationStrategy is not InitializationStrategy.None);
-
- if (!type.CanInitialize)
- {
- _writer.WriteLine(GetInitException(type.InitExceptionMessage) + ";");
- return true;
- }
-
- return false;
- }
-
- private void EmitRootBindingClassStartBlock(string className)
- {
- EmitBlankLineIfRequired();
- EmitStartBlock($$"""
- /// Generated helper providing an AOT and linking compatible implementation for configuration binding.
- {{GetGeneratedCodeAttributeSrc()}}
- internal static class {{className}}
- """);
-
- _emitBlankLineBeforeNextStatement = false;
- }
-
- private string GetGeneratedCodeAttributeSrc()
- {
- string attributeRefExpr = _useFullyQualifiedNames ? $"global::System.CodeDom.Compiler.GeneratedCodeAttribute" : "GeneratedCode";
- return $@"[{attributeRefExpr}(""{s_assemblyName.Name}"", ""{s_assemblyName.Version}"")]";
- }
-
- private string GetInitException(string message) => $@"throw new {GetInvalidOperationDisplayName()}(""{message}"")";
-
private string GetIncrementalIdentifier(string prefix) => $"{prefix}{_valueSuffixIndex++}";
- private string GetInitalizeMethodDisplayString(ObjectSpec type) =>
- GetHelperMethodDisplayString($"{nameof(MethodsToGen_CoreBindingHelper.Initialize)}{type.DisplayStringWithoutSpecialCharacters}");
-
- private string GetTypeDisplayString(TypeSpec type) => _useFullyQualifiedNames ? type.FullyQualifiedDisplayString : type.MinimalDisplayString;
-
- private string GetHelperMethodDisplayString(string methodName)
- {
- if (_useFullyQualifiedNames)
- {
- methodName = FullyQualifiedDisplayString.CoreBindingHelper + "." + methodName;
- }
-
- return methodName;
- }
-
- private string GetInvalidOperationDisplayName() => _useFullyQualifiedNames ? FullyQualifiedDisplayString.InvalidOperationException : Identifier.InvalidOperationException;
+ private static string GetInitalizeMethodDisplayString(ObjectSpec type) =>
+ $"{nameof(MethodsToGen_CoreBindingHelper.Initialize)}{type.IdentifierCompatibleSubstring}";
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/OptionsBuilderConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/OptionsBuilderConfigurationExtensions.cs
new file mode 100644
index 00000000000000..fdc4286e34c559
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/OptionsBuilderConfigurationExtensions.cs
@@ -0,0 +1,100 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed partial class ConfigurationBindingGenerator
+ {
+ private sealed partial class Emitter
+ {
+ private void EmitBindingExtensions_OptionsBuilder()
+ {
+ if (!ShouldEmitMethods(MethodsToGen.OptionsBuilderExt_Any))
+ {
+ return;
+ }
+
+ EmitBindingExtStartRegion(TypeDisplayString.OptionsBuilderOfTOptions);
+ EmitBindMethods_Extensions_OptionsBuilder();
+ EmitBindConfigurationMethod();
+ EmitBindingExtEndRegion();
+ }
+
+ private void EmitBindMethods_Extensions_OptionsBuilder()
+ {
+ if (!ShouldEmitMethods(MethodsToGen.OptionsBuilderExt_Bind))
+ {
+ return;
+ }
+
+ const string documentation = @"/// Registers a configuration instance which will bind against.";
+ const string paramList = $"{Identifier.IConfiguration} {Identifier.config}";
+
+ if (ShouldEmitMethods(MethodsToGen.OptionsBuilderExt_Bind_T))
+ {
+ EmitMethodStartBlock(MethodsToGen.OptionsBuilderExt_Bind_T, "Bind", paramList, documentation);
+ _writer.WriteLine($"return Bind({Identifier.optionsBuilder}, {Identifier.config}, {Identifier.configureBinder}: null);");
+ EmitEndBlock();
+ }
+
+ EmitMethodStartBlock(
+ MethodsToGen.OptionsBuilderExt_Bind_T_BinderOptions,
+ "Bind",
+ paramList + $", {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureBinder}",
+ documentation);
+
+ EmitCheckForNullArgument_WithBlankLine(Identifier.optionsBuilder);
+
+ _writer.WriteLine($$"""
+ {{Identifier.Configure}}<{{Identifier.TOptions}}>({{Identifier.optionsBuilder}}.{{Identifier.Services}}, {{Identifier.optionsBuilder}}.Name, {{Identifier.config}}, {{Identifier.configureBinder}});
+ return {{Identifier.optionsBuilder}};
+ """);
+
+ EmitEndBlock();
+ }
+
+ private void EmitBindConfigurationMethod()
+ {
+ if (!ShouldEmitMethods(MethodsToGen.OptionsBuilderExt_BindConfiguration_T_path_BinderOptions))
+ {
+ return;
+ }
+
+ const string documentation = $@"/// Registers the dependency injection container to bind against the obtained from the DI service provider.";
+ string paramList = $"string {Identifier.configSectionPath}, {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureBinder} = null";
+
+ EmitMethodStartBlock(MethodsToGen.OptionsBuilderExt_BindConfiguration, "BindConfiguration", paramList, documentation);
+
+ EmitCheckForNullArgument_WithBlankLine(Identifier.optionsBuilder);
+ EmitCheckForNullArgument_WithBlankLine(Identifier.configSectionPath);
+
+ EmitStartBlock($"{Identifier.optionsBuilder}.{Identifier.Configure}<{Identifier.IConfiguration}>(({Identifier.instance}, {Identifier.config}) =>");
+ EmitCheckForNullArgument_WithBlankLine(Identifier.config);
+ _writer.WriteLine($$"""
+ {{Identifier.IConfiguration}} {{Identifier.section}} = string.Equals(string.Empty, {{Identifier.configSectionPath}}, StringComparison.OrdinalIgnoreCase) ? {{Identifier.config}} : {{Identifier.config}}.{{Identifier.GetSection}}({{Identifier.configSectionPath}});
+ {{nameof(MethodsToGen_CoreBindingHelper.BindCoreMain)}}({{Identifier.section}}, {{Identifier.instance}}, typeof({{Identifier.TOptions}}), {{Identifier.configureBinder}});
+ """);
+
+ EmitEndBlock(endBraceTrailingSource: ");");
+
+ _writer.WriteLine();
+
+ _writer.WriteLine($$"""
+ {{Identifier.optionsBuilder}}.{{Identifier.Services}}.{{Identifier.AddSingleton}}<{{Identifier.IOptionsChangeTokenSource}}<{{Identifier.TOptions}}>, {{Identifier.ConfigurationChangeTokenSource}}<{{Identifier.TOptions}}>>();
+ return {{Identifier.optionsBuilder}};
+ """);
+
+ EmitEndBlock();
+ }
+
+ private void EmitMethodStartBlock(MethodsToGen method, string methodName, string paramList, string documentation)
+ {
+ paramList = $"this {TypeDisplayString.OptionsBuilderOfTOptions} {Identifier.optionsBuilder}, {paramList}";
+ EmitBlankLineIfRequired();
+ _writer.WriteLine(documentation);
+ EmitInterceptsLocationAnnotations(method);
+ EmitStartBlock($"public static {TypeDisplayString.OptionsBuilderOfTOptions} {methodName}<{Identifier.TOptions}>({paramList}) where {Identifier.TOptions} : class");
+ }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/OptionsConfigurationServiceCollectionExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
new file mode 100644
index 00000000000000..daa3b79db8abc4
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
@@ -0,0 +1,77 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed partial class ConfigurationBindingGenerator
+ {
+ private sealed partial class Emitter
+ {
+ private void EmitBindingExtensions_IServiceCollection()
+ {
+ if (!ShouldEmitMethods(MethodsToGen.ServiceCollectionExt_Any))
+ {
+ return;
+ }
+
+ EmitBindingExtStartRegion(Identifier.IServiceCollection);
+ EmitConfigureMethods();
+ EmitBindingExtEndRegion();
+ }
+
+ private void EmitConfigureMethods()
+ {
+ const string defaultNameExpr = "string.Empty";
+ string configParam = $"{Identifier.IConfiguration} {Identifier.config}";
+
+ if (ShouldEmitMethods(MethodsToGen.ServiceCollectionExt_Configure_T))
+ {
+ EmitStartMethod(MethodsToGen.ServiceCollectionExt_Configure_T, configParam);
+ _writer.WriteLine($"return {Identifier.Configure}<{Identifier.TOptions}>({Identifier.services}, {defaultNameExpr}, {Identifier.config}, {Identifier.configureOptions}: null);");
+ EmitEndBlock();
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ServiceCollectionExt_Configure_T_name))
+ {
+ EmitStartMethod(
+ MethodsToGen.ServiceCollectionExt_Configure_T_name,
+ paramList: $"string? {Identifier.name}, " + configParam);
+ _writer.WriteLine($"return {Identifier.Configure}<{Identifier.TOptions}>({Identifier.services}, {Identifier.name}, {Identifier.config}, {Identifier.configureOptions}: null);");
+ EmitEndBlock();
+ }
+
+ if (ShouldEmitMethods(MethodsToGen.ServiceCollectionExt_Configure_T_BinderOptions))
+ {
+ EmitStartMethod(
+ MethodsToGen.ServiceCollectionExt_Configure_T_BinderOptions,
+ paramList: configParam + $", {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureOptions}");
+ _writer.WriteLine($"return {Identifier.Configure}<{Identifier.TOptions}>({Identifier.services}, {defaultNameExpr}, {Identifier.config}, {Identifier.configureOptions});");
+ EmitEndBlock();
+ }
+
+ // Core Configure method that the other overloads call.
+ // Like the others, it is public API that could be called directly by users.
+ // So, it is always generated whenever a Configure overload is called.
+ EmitStartMethod(MethodsToGen.ServiceCollectionExt_Configure_T_name_BinderOptions, paramList: $"string? {Identifier.name}, " + configParam + $", {TypeDisplayString.NullableActionOfBinderOptions} {Identifier.configureOptions}");
+ EmitCheckForNullArgument_WithBlankLine(Identifier.services);
+ EmitCheckForNullArgument_WithBlankLine(Identifier.config);
+ _writer.WriteLine($$"""
+ OptionsServiceCollectionExtensions.AddOptions({{Identifier.services}});
+ {{Identifier.services}}.{{Identifier.AddSingleton}}<{{Identifier.IOptionsChangeTokenSource}}<{{Identifier.TOptions}}>>(new {{Identifier.ConfigurationChangeTokenSource}}<{{Identifier.TOptions}}>({{Identifier.name}}, {{Identifier.config}}));
+ return {{Identifier.services}}.{{Identifier.AddSingleton}}>(new ConfigureNamedOptions<{{Identifier.TOptions}}>({{Identifier.name}}, {{Identifier.instance}} => {{nameof(MethodsToGen_CoreBindingHelper.BindCoreMain)}}({{Identifier.config}}, {{Identifier.instance}}, typeof({{Identifier.TOptions}}), {{Identifier.configureOptions}})));
+ """);
+ EmitEndBlock();
+ }
+
+ private void EmitStartMethod(MethodsToGen overload, string paramList)
+ {
+ paramList = $"this {Identifier.IServiceCollection} {Identifier.services}, {paramList}";
+
+ EmitBlankLineIfRequired();
+ _writer.WriteLine("/// Registers a configuration instance which TOptions will bind against.");
+ EmitInterceptsLocationAnnotations(overload);
+ EmitStartBlock($"public static {Identifier.IServiceCollection} {Identifier.Configure}<{Identifier.TOptions}>({paramList}) where {Identifier.TOptions} : class");
+ }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/ConfigurationBinder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/ConfigurationBinder.cs
deleted file mode 100644
index c10e607df75d0a..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/ConfigurationBinder.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- public sealed partial class ConfigurationBindingGenerator
- {
- private sealed partial class Emitter
- {
- private bool ShouldEmitMethods(MethodsToGen_ConfigurationBinder methods) => (_sourceGenSpec.MethodsToGen_ConfigurationBinder & methods) != 0;
-
- private void EmitBinder_Extensions_IConfiguration()
- {
- Debug.Assert(_sourceGenSpec.TypesForGen_ConfigurationBinder_BindMethods.Count <= 3 &&
- !_sourceGenSpec.TypesForGen_ConfigurationBinder_BindMethods.Keys.Any(overload => (overload & MethodsToGen_ConfigurationBinder.Bind) is 0));
-
- if (!ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Any))
- {
- return;
- }
-
- _emitBlankLineBeforeNextStatement = false;
- EmitRootBindingClassStartBlock(Identifier.GeneratedConfigurationBinder);
-
- EmitGetMethods();
- EmitGetValueMethods();
- EmitBindMethods_ConfigurationBinder();
-
- EmitEndBlock();
- _emitBlankLineBeforeNextStatement = true;
- }
-
- private void EmitGetMethods()
- {
- const string expressionForGetCore = $"{FullyQualifiedDisplayString.CoreBindingHelper}.{nameof(MethodsToGen_CoreBindingHelper.GetCore)}";
- const string documentation = "Attempts to bind the configuration instance to a new instance of type T.";
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Get_T))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static T? {Identifier.Get}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}) => " +
- $"(T?)({expressionForGetCore}({Identifier.configuration}, typeof(T), {Identifier.configureOptions}: null) ?? default(T));");
- }
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Get_T_BinderOptions))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static T? {Identifier.Get}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, {FullyQualifiedDisplayString.ActionOfBinderOptions}? {Identifier.configureOptions}) => " +
- $"(T?)({expressionForGetCore}({Identifier.configuration}, typeof(T), {Identifier.configureOptions}) ?? default(T));");
- }
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Get_TypeOf))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static object? {Identifier.Get}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, {FullyQualifiedDisplayString.Type} {Identifier.type}) => " +
- $"{expressionForGetCore}({Identifier.configuration}, {Identifier.type}, {Identifier.configureOptions}: null);");
- }
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Get_TypeOf_BinderOptions))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static object? {Identifier.Get}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, {FullyQualifiedDisplayString.Type} {Identifier.type}, {FullyQualifiedDisplayString.ActionOfBinderOptions}? {Identifier.configureOptions}) => " +
- $"{expressionForGetCore}({Identifier.configuration}, {Identifier.type}, {Identifier.configureOptions});");
- }
- }
-
- private void EmitGetValueMethods()
- {
- const string expressionForGetValueCore = $"{FullyQualifiedDisplayString.CoreBindingHelper}.{nameof(MethodsToGen_CoreBindingHelper.GetValueCore)}";
- const string documentation = "Extracts the value with the specified key and converts it to the specified type.";
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.GetValue_T_key))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static T? {Identifier.GetValue}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, string {Identifier.key}) => " +
- $"(T?)({expressionForGetValueCore}({Identifier.configuration}, typeof(T), {Identifier.key}) ?? default(T));");
- }
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.GetValue_T_key_defaultValue))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static T? {Identifier.GetValue}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, string {Identifier.key}, T {Identifier.defaultValue}) => " +
- $"(T?)({expressionForGetValueCore}({Identifier.configuration}, typeof(T), {Identifier.key}) ?? {Identifier.defaultValue});");
- }
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.GetValue_TypeOf_key))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static object? {Identifier.GetValue}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, {FullyQualifiedDisplayString.Type} {Identifier.type}, string {Identifier.key}) => " +
- $"{expressionForGetValueCore}({Identifier.configuration}, {Identifier.type}, {Identifier.key});");
- }
-
- if (ShouldEmitMethods(MethodsToGen_ConfigurationBinder.GetValue_TypeOf_key_defaultValue))
- {
- StartMethodDefinition(documentation);
- _writer.WriteLine($"public static object? {Identifier.GetValue}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, {FullyQualifiedDisplayString.Type} {Identifier.type}, string {Identifier.key}, object? {Identifier.defaultValue}) => " +
- $"{expressionForGetValueCore}({Identifier.configuration}, {Identifier.type}, {Identifier.key}) ?? {Identifier.defaultValue};");
- }
- }
-
- private void EmitBindMethods_ConfigurationBinder()
- {
- if (!ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Bind))
- {
- return;
- }
-
- Dictionary> types = _sourceGenSpec.TypesForGen_ConfigurationBinder_BindMethods;
-
- if (types.TryGetValue(MethodsToGen_ConfigurationBinder.Bind_instance, out HashSet? typeSpecs))
- {
- foreach (TypeSpec type in typeSpecs)
- {
- EmitMethodImplementation(
- type,
- additionalParams: GetObjParameter(type),
- configExpression: Identifier.configuration,
- configureOptions: false);
- }
- }
-
- if (types.TryGetValue(MethodsToGen_ConfigurationBinder.Bind_instance_BinderOptions, out typeSpecs))
- {
- foreach (TypeSpec type in typeSpecs)
- {
- EmitMethodImplementation(
- type,
- additionalParams: $"{GetObjParameter(type)}, {FullyQualifiedDisplayString.ActionOfBinderOptions}? {Identifier.configureOptions}",
- configExpression: Identifier.configuration,
- configureOptions: true);
- }
- }
-
- if (types.TryGetValue(MethodsToGen_ConfigurationBinder.Bind_key_instance, out typeSpecs))
- {
- foreach (TypeSpec type in typeSpecs)
- {
- EmitMethodImplementation(
- type,
- additionalParams: $"string {Identifier.key}, {GetObjParameter(type)}",
- configExpression: $"{Expression.configurationGetSection}({Identifier.key})",
- configureOptions: false);
- }
- }
-
- void EmitMethodImplementation(TypeSpec type, string additionalParams, string configExpression, bool configureOptions)
- {
- string binderOptionsArg = configureOptions ? $"{Expression.GetBinderOptions}({Identifier.configureOptions})" : $"{Identifier.binderOptions}: null";
-
- string returnExpression;
- if (type.CanInitialize)
- {
- returnExpression = type.NeedsMemberBinding
- ? $"{FullyQualifiedDisplayString.CoreBindingHelper}.{nameof(MethodsToGen_CoreBindingHelper.BindCore)}({configExpression}, ref {Identifier.obj}, {binderOptionsArg})"
- : "{ }";
- }
- else
- {
- returnExpression = GetInitException(type.InitExceptionMessage);
- }
-
- StartMethodDefinition("Attempts to bind the given object instance to configuration values by matching property names against configuration keys recursively.");
- _writer.WriteLine($"public static void {Identifier.Bind}(this {FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}, {additionalParams}) => "
- + $"{returnExpression};");
- }
-
- string GetObjParameter(TypeSpec type) => $"{type.FullyQualifiedDisplayString} {Identifier.obj}";
- }
-
- private void StartMethodDefinition(string documentation)
- {
- EmitBlankLineIfRequired();
- _writer.WriteLine($"/// {documentation}");
- }
- }
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/CoreBindingHelper.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/CoreBindingHelper.cs
deleted file mode 100644
index a7b42b1329804e..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/CoreBindingHelper.cs
+++ /dev/null
@@ -1,955 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- public sealed partial class ConfigurationBindingGenerator
- {
- private sealed partial class Emitter
- {
- private bool ShouldEmitMethods(MethodsToGen_CoreBindingHelper methods) => (_sourceGenSpec.MethodsToGen_CoreBindingHelper & methods) != 0;
-
- private void Emit_CoreBindingHelper()
- {
- Debug.Assert(_emitBlankLineBeforeNextStatement);
- _writer.WriteLine();
- _emitBlankLineBeforeNextStatement = false;
-
- EmitStartBlock($"namespace {ProjectName}");
- EmitHelperUsingStatements();
-
- _writer.WriteLine();
-
- EmitStartBlock($$"""
- /// Provide core binding logic.
- {{GetGeneratedCodeAttributeSrc()}}
- file static class {{Identifier.CoreBindingHelper}}
- """);
-
- EmitConfigurationKeyCaches();
- EmitGetCoreMethod();
- EmitGetValueCoreMethod();
- EmitBindCoreUntypedMethod();
- EmitBindCoreMethods();
- EmitInitializeMethods();
- EmitHelperMethods();
-
- EmitEndBlock(); // End helper class.
- EmitEndBlock(); // End namespace.
- }
-
- private void EmitHelperUsingStatements()
- {
- foreach (string @namespace in _sourceGenSpec.TypeNamespaces.ToImmutableSortedSet())
- {
- _writer.WriteLine($"using {@namespace};");
- }
- }
-
- private void EmitConfigurationKeyCaches()
- {
- if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(MethodsToGen_CoreBindingHelper.BindCore, out HashSet targetTypes))
- {
- return;
- }
-
- foreach (TypeSpec type in targetTypes)
- {
- if (type is not ObjectSpec objectType)
- {
- continue;
- }
-
- HashSet keys = new(objectType.ConstructorParameters.Select(m => GetCacheElement(m)));
- keys.UnionWith(objectType.Properties.Values.Select(m => GetCacheElement(m)));
- static string GetCacheElement(MemberSpec member) => $@"""{member.ConfigurationKeyName}""";
-
- string configKeysSource = string.Join(", ", keys);
- string fieldName = GetConfigKeyCacheFieldName(objectType);
- _writer.WriteLine($@"private readonly static Lazy<{MinimalDisplayString.HashSetOfString}> {fieldName} = new(() => new {MinimalDisplayString.HashSetOfString}(StringComparer.OrdinalIgnoreCase) {{ {configKeysSource} }});");
- }
-
- _emitBlankLineBeforeNextStatement = true;
- }
-
- private void EmitGetCoreMethod()
- {
- if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(MethodsToGen_CoreBindingHelper.GetCore, out HashSet? types))
- {
- return;
- }
-
- EmitBlankLineIfRequired();
- EmitStartBlock($"public static object? {nameof(MethodsToGen_CoreBindingHelper.GetCore)}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}, Action<{Identifier.BinderOptions}>? {Identifier.configureOptions})");
-
- EmitCheckForNullArgument_WithBlankLine(Identifier.configuration);
-
- _writer.WriteLine($"{Identifier.BinderOptions}? {Identifier.binderOptions} = {Identifier.GetBinderOptions}({Identifier.configureOptions});");
- _writer.WriteLine();
-
- EmitIConfigurationHasValueOrChildrenCheck(voidReturn: false);
-
- foreach (TypeSpec type in types)
- {
- TypeSpec effectiveType = type.EffectiveType;
- TypeSpecKind kind = effectiveType.SpecKind;
-
- EmitStartBlock($"if (type == typeof({type.MinimalDisplayString}))");
-
- if (effectiveType is ParsableFromStringSpec stringParsableType)
- {
- EmitCastToIConfigurationSection();
- EmitBindLogicFromString(
- stringParsableType,
- Expression.sectionValue,
- Expression.sectionPath,
- writeOnSuccess: parsedValueExpr => _writer.WriteLine($"return {parsedValueExpr};"),
- checkForNullSectionValue: stringParsableType.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue,
- useIncrementalStringValueIdentifier: false);
- }
- else if (!EmitInitException(effectiveType))
- {
- EmitBindCoreCall(effectiveType, Identifier.obj, Identifier.configuration, InitializationKind.Declaration);
- _writer.WriteLine($"return {Identifier.obj};");
- }
-
- EmitEndBlock();
- _writer.WriteLine();
- }
-
- Emit_NotSupportedException_TypeNotDetectedAsInput();
- EmitEndBlock();
- _emitBlankLineBeforeNextStatement = true;
- }
-
- private void EmitGetValueCoreMethod()
- {
- if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(MethodsToGen_CoreBindingHelper.GetValueCore, out HashSet? targetTypes))
- {
- return;
- }
-
- EmitBlankLineIfRequired();
- EmitStartBlock($"public static object? {nameof(MethodsToGen_CoreBindingHelper.GetValueCore)}(this {Identifier.IConfiguration} {Identifier.configuration}, Type {Identifier.type}, string {Identifier.key})");
-
- EmitCheckForNullArgument_WithBlankLine(Identifier.configuration);
- _writer.WriteLine($@"{Identifier.IConfigurationSection} {Identifier.section} = {GetSectionFromConfigurationExpression(Identifier.key, addQuotes: false)};");
- _writer.WriteLine();
-
- _writer.WriteLine($$"""
- if ({{Expression.sectionValue}} is not string {{Identifier.value}})
- {
- return null;
- }
- """);
-
- _writer.WriteLine();
-
- foreach (TypeSpec type in targetTypes)
- {
- EmitStartBlock($"if ({Identifier.type} == typeof({type.MinimalDisplayString}))");
-
- EmitBindLogicFromString(
- (ParsableFromStringSpec)type.EffectiveType,
- Identifier.value,
- Expression.sectionPath,
- writeOnSuccess: (parsedValueExpr) => _writer.WriteLine($"return {parsedValueExpr};"),
- checkForNullSectionValue: false,
- useIncrementalStringValueIdentifier: false);
-
- EmitEndBlock();
- _writer.WriteLine();
- }
-
- _writer.WriteLine("return null;");
- EmitEndBlock();
- _emitBlankLineBeforeNextStatement = true;
- }
-
- private void EmitBindCoreUntypedMethod()
- {
- if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(MethodsToGen_CoreBindingHelper.BindCoreUntyped, out HashSet? targetTypes))
- {
- return;
- }
-
- EmitBlankLineIfRequired();
-
- EmitStartBlock($"public static void {nameof(MethodsToGen_CoreBindingHelper.BindCoreUntyped)}(this {Identifier.IConfiguration} {Identifier.configuration}, object {Identifier.obj}, Type {Identifier.type}, {MinimalDisplayString.NullableActionOfBinderOptions} {Identifier.configureOptions})");
-
- EmitCheckForNullArgument_WithBlankLine(Identifier.configuration);
-
- _writer.WriteLine($"{Identifier.BinderOptions}? {Identifier.binderOptions} = {Identifier.GetBinderOptions}({Identifier.configureOptions});");
- _writer.WriteLine();
-
- EmitIConfigurationHasValueOrChildrenCheck(voidReturn: true);
-
- foreach (TypeSpec type in targetTypes)
- {
- EmitStartBlock($"if (type == typeof({type.MinimalDisplayString}))");
-
- TypeSpec effectiveType = type.EffectiveType;
- if (!EmitInitException(effectiveType))
- {
- _writer.WriteLine($"var {Identifier.temp} = ({effectiveType.MinimalDisplayString}){Identifier.obj};");
- EmitBindCoreCall(type, Identifier.temp, Identifier.configuration, InitializationKind.None);
- _writer.WriteLine($"return;");
- }
-
- EmitEndBlock();
- _writer.WriteLine();
- }
-
- Emit_NotSupportedException_TypeNotDetectedAsInput();
- EmitEndBlock();
- _emitBlankLineBeforeNextStatement = true;
- }
-
- private void EmitBindCoreMethods()
- {
- if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(MethodsToGen_CoreBindingHelper.BindCore, out HashSet? targetTypes))
- {
- return;
- }
-
- foreach (TypeSpec type in targetTypes)
- {
- Debug.Assert(type.NeedsMemberBinding);
- EmitBlankLineIfRequired();
- EmitBindCoreMethod(type);
- }
- }
-
- private void EmitBindCoreMethod(TypeSpec type)
- {
- Debug.Assert(type.CanInitialize);
-
- string objParameterExpression = $"ref {type.MinimalDisplayString} {Identifier.obj}";
- EmitStartBlock(@$"public static void {nameof(MethodsToGen_CoreBindingHelper.BindCore)}({Identifier.IConfiguration} {Identifier.configuration}, {objParameterExpression}, {Identifier.BinderOptions}? {Identifier.binderOptions})");
-
- EmitCheckForNullArgument_WithBlankLine_IfRequired(type.IsValueType);
-
- TypeSpec effectiveType = type.EffectiveType;
- if (effectiveType is EnumerableSpec enumerable)
- {
- if (effectiveType.InitializationStrategy is InitializationStrategy.Array)
- {
- Debug.Assert(type == effectiveType);
- EmitPopulationImplForArray((EnumerableSpec)type);
- }
- else
- {
- EmitPopulationImplForEnumerableWithAdd(enumerable);
- }
- }
- else if (effectiveType is DictionarySpec dictionary)
- {
- EmitBindCoreImplForDictionary(dictionary);
- }
- else
- {
- EmitBindCoreImplForObject((ObjectSpec)effectiveType);
- }
-
- EmitEndBlock();
- }
-
- private void EmitInitializeMethods()
- {
- if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(MethodsToGen_CoreBindingHelper.Initialize, out HashSet? targetTypes))
- {
- return;
- }
-
- foreach (ObjectSpec type in targetTypes)
- {
- EmitBlankLineIfRequired();
- EmitInitializeMethod(type);
- }
- }
-
- private void EmitInitializeMethod(ObjectSpec type)
- {
- Debug.Assert(type.CanInitialize);
- List ctorParams = type.ConstructorParameters;
- IEnumerable initOnlyProps = type.Properties.Values.Where(prop => prop is { SetOnInit: true });
- List ctorArgList = new();
- string displayString = type.MinimalDisplayString;
-
- EmitStartBlock($"public static {type.MinimalDisplayString} {GetInitalizeMethodDisplayString(type)}({Identifier.IConfiguration} {Identifier.configuration}, {Identifier.BinderOptions}? {Identifier.binderOptions})");
- _emitBlankLineBeforeNextStatement = false;
-
- foreach (ParameterSpec parameter in ctorParams)
- {
- string name = parameter.Name;
- string argExpr = parameter.RefKind switch
- {
- RefKind.None => name,
- RefKind.Ref => $"ref {name}",
- RefKind.Out => "out _",
- RefKind.In => $"in {name}",
- _ => throw new InvalidOperationException()
- };
-
- ctorArgList.Add(argExpr);
- EmitBindImplForMember(parameter);
- }
-
- foreach (PropertySpec property in initOnlyProps)
- {
- if (property.ShouldBind() && property.MatchingCtorParam is null)
- {
- EmitBindImplForMember(property);
- }
- }
-
- string returnExpression = $"return new {displayString}({string.Join(", ", ctorArgList)})";
- if (!initOnlyProps.Any())
- {
- _writer.WriteLine($"{returnExpression};");
- }
- else
- {
- EmitStartBlock(returnExpression);
- foreach (PropertySpec property in initOnlyProps)
- {
- string propertyName = property.Name;
- _writer.WriteLine($@"{propertyName} = {propertyName},");
- }
- EmitEndBlock(endBraceTrailingSource: ";");
- }
-
- // End method.
- EmitEndBlock();
- _emitBlankLineBeforeNextStatement = true;
-
- void EmitBindImplForMember(MemberSpec member)
- {
- TypeSpec memberType = member.Type;
- bool errorOnFailedBinding = member.ErrorOnFailedBinding;
-
- string parsedMemberIdentifierDeclarationPrefix = $"{memberType.MinimalDisplayString} {member.Name}";
- string parsedMemberIdentifier;
-
- if (memberType is ParsableFromStringSpec { StringParsableTypeKind: StringParsableTypeKind.AssignFromSectionValue })
- {
- parsedMemberIdentifier = parsedMemberIdentifierDeclarationPrefix;
-
- if (errorOnFailedBinding)
- {
- string condition = $@" if ({Identifier.configuration}[""{member.ConfigurationKeyName}""] is not {memberType.MinimalDisplayString} {member.Name})";
- EmitThrowBlock(condition);
- _writer.WriteLine();
- return;
- }
- }
- else
- {
- parsedMemberIdentifier = member.Name;
-
- string declarationSuffix;
- if (errorOnFailedBinding)
- {
- declarationSuffix = ";";
- }
- else
- {
- string bangExpr = memberType.IsValueType ? string.Empty : "!";
- declarationSuffix = memberType.CanInitialize
- ? $" = {member.DefaultValueExpr}{bangExpr};"
- : ";";
- }
-
- string parsedMemberIdentifierDeclaration = $"{parsedMemberIdentifierDeclarationPrefix}{declarationSuffix}";
- _writer.WriteLine(parsedMemberIdentifierDeclaration);
- _emitBlankLineBeforeNextStatement = false;
- }
-
- bool canBindToMember = this.EmitBindImplForMember(
- member,
- parsedMemberIdentifier,
- sectionPathExpr: GetSectionPathFromConfigurationExpression(member.ConfigurationKeyName),
- canSet: true);
-
- if (canBindToMember)
- {
- if (errorOnFailedBinding)
- {
- // Add exception logic for parameter ctors; must be present in configuration object.
- EmitThrowBlock(condition: "else");
- }
-
- _writer.WriteLine();
- }
-
- void EmitThrowBlock(string condition) =>
- _writer.WriteLine($$"""
- {{condition}}
- {
- throw new {{GetInvalidOperationDisplayName()}}("{{string.Format(ExceptionMessages.ParameterHasNoMatchingConfig, type.Name, member.Name)}}");
- }
- """);
- }
- }
- private void EmitHelperMethods()
- {
- if (ShouldEmitMethods(MethodsToGen_CoreBindingHelper.BindCore))
- {
- EmitValidateConfigurationKeysMethod();
- }
-
- if (ShouldEmitMethods(MethodsToGen_CoreBindingHelper.BindCoreUntyped | MethodsToGen_CoreBindingHelper.GetCore))
- {
- _writer.WriteLine();
- EmitHasValueOrChildrenMethod();
- _writer.WriteLine();
- EmitAsConfigWithChildrenMethod();
- _emitBlankLineBeforeNextStatement = true;
- }
- else if (ShouldEmitMethods(MethodsToGen_CoreBindingHelper.AsConfigWithChildren))
- {
- _writer.WriteLine();
- EmitAsConfigWithChildrenMethod();
- _emitBlankLineBeforeNextStatement = true;
- }
-
- if (ShouldEmitMethods(
- MethodsToGen_CoreBindingHelper.BindCoreUntyped | MethodsToGen_CoreBindingHelper.GetCore) ||
- ShouldEmitMethods(MethodsToGen_ConfigurationBinder.Bind_instance_BinderOptions))
- {
- _writer.WriteLine();
- EmitGetBinderOptionsHelper();
- _emitBlankLineBeforeNextStatement = true;
- }
-
- bool enumTypeExists = false;
-
- foreach (ParsableFromStringSpec type in _sourceGenSpec.PrimitivesForHelperGen)
- {
- EmitBlankLineIfRequired();
-
- if (type.StringParsableTypeKind == StringParsableTypeKind.Enum)
- {
- if (!enumTypeExists)
- {
- EmitEnumParseMethod();
- enumTypeExists = true;
- }
- }
- else
- {
- EmitPrimitiveParseMethod(type);
- }
- }
- }
-
- private void EmitValidateConfigurationKeysMethod()
- {
- const string keysIdentifier = "keys";
- string exceptionMessage = string.Format(ExceptionMessages.MissingConfig, Identifier.ErrorOnUnknownConfiguration, Identifier.BinderOptions, $"{{{Identifier.type}}}", $@"{{string.Join("", "", {Identifier.temp})}}");
-
- EmitBlankLineIfRequired();
- _writer.WriteLine($$"""
- /// If required by the binder options, validates that there are no unknown keys in the input configuration object.
- public static void {{Identifier.ValidateConfigurationKeys}}(Type {{Identifier.type}}, {{MinimalDisplayString.LazyHashSetOfString}} {{keysIdentifier}}, {{Identifier.IConfiguration}} {{Identifier.configuration}}, {{Identifier.BinderOptions}}? {{Identifier.binderOptions}})
- {
- if ({{Identifier.binderOptions}}?.{{Identifier.ErrorOnUnknownConfiguration}} is true)
- {
- {{MinimalDisplayString.ListOfString}}? {{Identifier.temp}} = null;
-
- foreach ({{Identifier.IConfigurationSection}} {{Identifier.section}} in {{Identifier.configuration}}.{{Identifier.GetChildren}}())
- {
- if (!{{keysIdentifier}}.Value.Contains({{Expression.sectionKey}}))
- {
- ({{Identifier.temp}} ??= new {{MinimalDisplayString.ListOfString}}()).Add($"'{{{Expression.sectionKey}}}'");
- }
- }
-
- if ({{Identifier.temp}} is not null)
- {
- throw new InvalidOperationException($"{{exceptionMessage}}");
- }
- }
- }
- """);
- }
-
- private void EmitHasValueOrChildrenMethod()
- {
- _writer.WriteLine($$"""
- public static bool {{Identifier.HasValueOrChildren}}({{Identifier.IConfiguration}} {{Identifier.configuration}})
- {
- if (({{Identifier.configuration}} as {{Identifier.IConfigurationSection}})?.{{Identifier.Value}} is not null)
- {
- return true;
- }
- return {{Identifier.AsConfigWithChildren}}({{Identifier.configuration}}) is not null;
- }
- """);
- }
-
- private void EmitAsConfigWithChildrenMethod()
- {
- _writer.WriteLine($$"""
- public static {{Identifier.IConfiguration}}? {{Identifier.AsConfigWithChildren}}({{Identifier.IConfiguration}} {{Identifier.configuration}})
- {
- foreach ({{Identifier.IConfigurationSection}} _ in {{Identifier.configuration}}.{{Identifier.GetChildren}}())
- {
- return {{Identifier.configuration}};
- }
- return null;
- }
- """);
- }
-
- private void EmitGetBinderOptionsHelper()
- {
- _writer.WriteLine($$"""
- public static {{Identifier.BinderOptions}}? {{Identifier.GetBinderOptions}}({{MinimalDisplayString.NullableActionOfBinderOptions}} {{Identifier.configureOptions}})
- {
- if ({{Identifier.configureOptions}} is null)
- {
- return null;
- }
-
- {{Identifier.BinderOptions}} {{Identifier.binderOptions}} = new();
- {{Identifier.configureOptions}}({{Identifier.binderOptions}});
-
- if ({{Identifier.binderOptions}}.BindNonPublicProperties)
- {
- throw new global::System.NotSupportedException($"{{string.Format(ExceptionMessages.CannotSpecifyBindNonPublicProperties)}}");
- }
-
- return {{Identifier.binderOptions}};
- }
- """);
- }
-
- private void EmitEnumParseMethod()
- {
- string innerExceptionTypeDisplayString = _useFullyQualifiedNames ? "global::System.Exception" : "Exception";
- string exceptionArg1 = string.Format(ExceptionMessages.FailedBinding, $"{{{Identifier.getPath}()}}", $"{{typeof(T)}}");
-
- _writer.WriteLine($$"""
- public static T ParseEnum(string value, Func getPath) where T : struct
- {
- try
- {
- #if NETFRAMEWORK || NETSTANDARD2_0
- return (T)Enum.Parse(typeof(T), value, ignoreCase: true);
- #else
- return Enum.Parse(value, ignoreCase: true);
- #endif
- }
- catch ({{innerExceptionTypeDisplayString}} {{Identifier.exception}})
- {
- throw new {{GetInvalidOperationDisplayName()}}($"{{exceptionArg1}}", {{Identifier.exception}});
- }
- }
- """);
- }
-
- private void EmitPrimitiveParseMethod(ParsableFromStringSpec type)
- {
- string innerExceptionTypeDisplayString;
- string cultureInfoTypeDisplayString;
- string numberStylesTypeDisplayString;
-
- if (_useFullyQualifiedNames)
- {
- innerExceptionTypeDisplayString = "global::System.Exception";
- cultureInfoTypeDisplayString = "global::System.Globalization.CultureInfo";
- numberStylesTypeDisplayString = "global::System.Globalization.NumberStyles";
- }
- else
- {
- innerExceptionTypeDisplayString = "Exception";
- cultureInfoTypeDisplayString = "CultureInfo";
- numberStylesTypeDisplayString = "NumberStyles";
- }
-
- StringParsableTypeKind typeKind = type.StringParsableTypeKind;
- string typeDisplayString = type.MinimalDisplayString;
-
- string invariantCultureExpression = $"{cultureInfoTypeDisplayString}.InvariantCulture";
-
- string parsedValueExpr;
- switch (typeKind)
- {
- case StringParsableTypeKind.Enum:
- return;
- case StringParsableTypeKind.ByteArray:
- {
- parsedValueExpr = $"Convert.FromBase64String({Identifier.value})";
- }
- break;
- case StringParsableTypeKind.Integer:
- {
- parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value}, {numberStylesTypeDisplayString}.Integer, {invariantCultureExpression})";
- }
- break;
- case StringParsableTypeKind.Float:
- {
- parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value}, {numberStylesTypeDisplayString}.Float, {invariantCultureExpression})";
- }
- break;
- case StringParsableTypeKind.Parse:
- {
- parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value})";
- }
- break;
- case StringParsableTypeKind.ParseInvariant:
- {
- parsedValueExpr = $"{typeDisplayString}.{Identifier.Parse}({Identifier.value}, {invariantCultureExpression})"; ;
- }
- break;
- case StringParsableTypeKind.CultureInfo:
- {
- parsedValueExpr = $"{cultureInfoTypeDisplayString}.GetCultureInfo({Identifier.value})";
- }
- break;
- case StringParsableTypeKind.Uri:
- {
- parsedValueExpr = $"new Uri({Identifier.value}, UriKind.RelativeOrAbsolute)";
- }
- break;
- default:
- {
- Debug.Fail($"Invalid string parsable kind: {typeKind}");
- return;
- }
- }
-
- string exceptionArg1 = string.Format(ExceptionMessages.FailedBinding, $"{{{Identifier.getPath}()}}", $"{{typeof({typeDisplayString})}}");
-
- EmitStartBlock($"public static {typeDisplayString} {type.ParseMethodName}(string {Identifier.value}, Func {Identifier.getPath})");
- EmitEndBlock($$"""
- try
- {
- return {{parsedValueExpr}};
- }
- catch ({{innerExceptionTypeDisplayString}} {{Identifier.exception}})
- {
- throw new {{GetInvalidOperationDisplayName()}}($"{{exceptionArg1}}", {{Identifier.exception}});
- }
- """);
- }
-
- private void EmitPopulationImplForArray(EnumerableSpec type)
- {
- EnumerableSpec concreteType = (EnumerableSpec)type.ConcreteType;
-
- // Create list and bind elements.
- string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
- EmitBindCoreCall(concreteType, tempIdentifier, Identifier.configuration, InitializationKind.Declaration);
-
- // Resize array and add binded elements.
- _writer.WriteLine($$"""
- {{Identifier.Int32}} {{Identifier.originalCount}} = {{Identifier.obj}}.{{Identifier.Length}};
- {{Identifier.Array}}.{{Identifier.Resize}}(ref {{Identifier.obj}}, {{Identifier.originalCount}} + {{tempIdentifier}}.{{Identifier.Count}});
- {{tempIdentifier}}.{{Identifier.CopyTo}}({{Identifier.obj}}, {{Identifier.originalCount}});
- """);
- }
-
- private void EmitPopulationImplForEnumerableWithAdd(EnumerableSpec type)
- {
- EmitCollectionCastIfRequired(type, out string objIdentifier);
-
- Emit_Foreach_Section_In_ConfigChildren_StartBlock();
-
- TypeSpec elementType = type.ElementType;
-
- if (elementType is ParsableFromStringSpec stringParsableType)
- {
- EmitBindLogicFromString(
- stringParsableType,
- Expression.sectionValue,
- Expression.sectionPath,
- (parsedValueExpr) => _writer.WriteLine($"{objIdentifier}.{Identifier.Add}({parsedValueExpr});"),
- checkForNullSectionValue: true,
- useIncrementalStringValueIdentifier: false);
- }
- else
- {
- EmitBindCoreCall(elementType, Identifier.value, Identifier.section, InitializationKind.Declaration);
- _writer.WriteLine($"{objIdentifier}.{Identifier.Add}({Identifier.value});");
- }
-
- EmitEndBlock();
- }
-
- private void EmitBindCoreImplForDictionary(DictionarySpec type)
- {
- EmitCollectionCastIfRequired(type, out string objIdentifier);
-
- Emit_Foreach_Section_In_ConfigChildren_StartBlock();
-
- ParsableFromStringSpec keyType = type.KeyType;
- TypeSpec elementType = type.ElementType;
-
- // Parse key
- EmitBindLogicFromString(
- keyType,
- Expression.sectionKey,
- Expression.sectionPath,
- Emit_BindAndAddLogic_ForElement,
- checkForNullSectionValue: false,
- useIncrementalStringValueIdentifier: false);
-
- void Emit_BindAndAddLogic_ForElement(string parsedKeyExpr)
- {
- if (elementType is ParsableFromStringSpec stringParsableElementType)
- {
- EmitBindLogicFromString(
- stringParsableElementType,
- Expression.sectionValue,
- Expression.sectionPath,
- writeOnSuccess: parsedValueExpr => _writer.WriteLine($"{objIdentifier}[{parsedKeyExpr}] = {parsedValueExpr};"),
- checkForNullSectionValue: true,
- useIncrementalStringValueIdentifier: false);
- }
- else // For complex types:
- {
- Debug.Assert(elementType.CanInitialize);
-
- if (keyType.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue)
- {
- // Save value to local to avoid parsing twice - during look-up and during add.
- _writer.WriteLine($"{keyType.MinimalDisplayString} {Identifier.key} = {parsedKeyExpr};");
- parsedKeyExpr = Identifier.key;
- }
-
- bool isValueType = elementType.IsValueType;
- string expressionForElementIsNotNull = $"{Identifier.element} is not null";
- string elementTypeDisplayString = elementType.MinimalDisplayString + (elementType.IsValueType ? string.Empty : "?");
-
- string expressionForElementExists = $"{objIdentifier}.{Identifier.TryGetValue}({parsedKeyExpr}, out {elementTypeDisplayString} {Identifier.element})";
- string conditionToUseExistingElement = expressionForElementExists;
-
- // If key already exists, bind to existing element instance if not null (for ref types).
- if (!isValueType)
- {
- conditionToUseExistingElement += $" && {expressionForElementIsNotNull}";
- }
-
- EmitStartBlock($"if (!({conditionToUseExistingElement}))");
- EmitObjectInit(elementType, Identifier.element, InitializationKind.SimpleAssignment, Identifier.section);
- EmitEndBlock();
-
- if (elementType is CollectionSpec { InitializationStrategy: InitializationStrategy.ParameterizedConstructor or InitializationStrategy.ToEnumerableMethod } collectionSpec)
- {
- // This is a read-only collection. If the element exists and is not null,
- // we need to copy its contents into a new instance & then append/bind to that.
-
- string initExpression = collectionSpec.InitializationStrategy is InitializationStrategy.ParameterizedConstructor
- ? $"new {collectionSpec.ConcreteType.MinimalDisplayString}({Identifier.element})"
- : $"{Identifier.element}.{collectionSpec.ToEnumerableMethodCall!}";
-
- _writer.WriteLine($$"""
- else
- {
- {{Identifier.element}} = {{initExpression}};
- }
- """);
- }
-
- EmitBindCoreCall(elementType, Identifier.element, Identifier.section, InitializationKind.None);
- _writer.WriteLine($"{objIdentifier}[{parsedKeyExpr}] = {Identifier.element};");
- }
- }
-
- EmitEndBlock();
- }
-
- private void EmitBindCoreImplForObject(ObjectSpec type)
- {
- Debug.Assert(type.NeedsMemberBinding);
-
- string keyCacheFieldName = GetConfigKeyCacheFieldName(type);
- string validateMethodCallExpr = $"{Identifier.ValidateConfigurationKeys}(typeof({type.MinimalDisplayString}), {keyCacheFieldName}, {Identifier.configuration}, {Identifier.binderOptions});";
- _writer.WriteLine(validateMethodCallExpr);
-
- foreach (PropertySpec property in type.Properties.Values)
- {
- bool noSetter_And_IsReadonly = !property.CanSet && property.Type is CollectionSpec { InitializationStrategy: InitializationStrategy.ParameterizedConstructor };
- if (property.ShouldBind() && !noSetter_And_IsReadonly)
- {
- string containingTypeRef = property.IsStatic ? type.MinimalDisplayString : Identifier.obj;
- EmitBindImplForMember(
- property,
- memberAccessExpr: $"{containingTypeRef}.{property.Name}",
- GetSectionPathFromConfigurationExpression(property.ConfigurationKeyName),
- canSet: property.CanSet);
- }
- }
- }
-
- private bool EmitBindImplForMember(
- MemberSpec member,
- string memberAccessExpr,
- string sectionPathExpr,
- bool canSet)
- {
- TypeSpec effectiveMemberType = member.Type.EffectiveType;
-
- if (effectiveMemberType is ParsableFromStringSpec stringParsableType)
- {
- if (canSet)
- {
- bool checkForNullSectionValue = member is ParameterSpec
- ? true
- : stringParsableType.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue;
-
- string nullBangExpr = checkForNullSectionValue ? string.Empty : "!";
-
- EmitBlankLineIfRequired();
- EmitBindLogicFromString(
- stringParsableType,
- $@"{Identifier.configuration}[""{member.ConfigurationKeyName}""]",
- sectionPathExpr,
- writeOnSuccess: parsedValueExpr => _writer.WriteLine($"{memberAccessExpr} = {parsedValueExpr}{nullBangExpr};"),
- checkForNullSectionValue,
- useIncrementalStringValueIdentifier: true);
- }
-
- return true;
- }
-
- string sectionParseExpr = GetSectionFromConfigurationExpression(member.ConfigurationKeyName);
-
- EmitBlankLineIfRequired();
-
- if (effectiveMemberType.SpecKind is TypeSpecKind.IConfigurationSection)
- {
- _writer.WriteLine($"{memberAccessExpr} = {sectionParseExpr};");
- return true;
- }
-
- string sectionValidationCall = $"{Identifier.AsConfigWithChildren}({sectionParseExpr})";
- string sectionIdentifier = GetIncrementalIdentifier(Identifier.section);
-
- EmitStartBlock($"if ({sectionValidationCall} is {Identifier.IConfigurationSection} {sectionIdentifier})");
-
- bool canInit = !EmitInitException(effectiveMemberType);
- if (canInit)
- {
- EmitBindCoreCallForMember(member, memberAccessExpr, sectionIdentifier, canSet);
- }
-
- EmitEndBlock();
- return canInit;
- }
-
- private void EmitBindCoreCallForMember(
- MemberSpec member,
- string memberAccessExpr,
- string configArgExpr,
- bool canSet)
- {
-
- TypeSpec memberType = member.Type;
- TypeSpec effectiveMemberType = memberType.EffectiveType;
-
- string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
- InitializationKind initKind;
- string targetObjAccessExpr;
-
- if (effectiveMemberType.IsValueType)
- {
- if (!canSet)
- {
- return;
- }
-
- Debug.Assert(canSet);
- string effectiveMemberTypeDisplayString = effectiveMemberType.MinimalDisplayString;
- initKind = InitializationKind.None;
-
- if (memberType.SpecKind is TypeSpecKind.Nullable)
- {
- string nullableTempIdentifier = GetIncrementalIdentifier(Identifier.temp);
-
- _writer.WriteLine($"{memberType.MinimalDisplayString} {nullableTempIdentifier} = {memberAccessExpr};");
-
- _writer.WriteLine(
- $"{effectiveMemberTypeDisplayString} {tempIdentifier} = {nullableTempIdentifier}.{Identifier.HasValue} ? {nullableTempIdentifier}.{Identifier.Value} : new {effectiveMemberTypeDisplayString}();");
- }
- else
- {
- _writer.WriteLine($"{effectiveMemberTypeDisplayString} {tempIdentifier} = {memberAccessExpr};");
- }
-
- targetObjAccessExpr = tempIdentifier;
- }
- else if (member.CanGet)
- {
- targetObjAccessExpr = memberAccessExpr;
- initKind = InitializationKind.AssignmentWithNullCheck;
- }
- else
- {
- targetObjAccessExpr = memberAccessExpr;
- initKind = InitializationKind.SimpleAssignment;
- }
-
- Action? writeOnSuccess = !canSet
- ? null
- : bindedValueIdentifier =>
- {
- if (memberAccessExpr != bindedValueIdentifier)
- {
- _writer.WriteLine($"{memberAccessExpr} = {bindedValueIdentifier};");
- }
- };
-
- EmitBindCoreCall(
- effectiveMemberType,
- targetObjAccessExpr,
- configArgExpr,
- initKind,
- writeOnSuccess);
- }
-
- private void EmitCollectionCastIfRequired(CollectionSpec type, out string objIdentifier)
- {
- objIdentifier = Identifier.obj;
- if (type.PopulationStrategy is CollectionPopulationStrategy.Cast_Then_Add)
- {
- objIdentifier = Identifier.temp;
- _writer.WriteLine($$"""
- if ({{Identifier.obj}} is not {{type.PopulationCastType!.MinimalDisplayString}} {{objIdentifier}})
- {
- return;
- }
- """);
- _writer.WriteLine();
- }
- }
-
- private void Emit_Foreach_Section_In_ConfigChildren_StartBlock() =>
- EmitStartBlock($"foreach ({Identifier.IConfigurationSection} {Identifier.section} in {Identifier.configuration}.{Identifier.GetChildren}())");
-
- private static string GetSectionPathFromConfigurationExpression(string configurationKeyName)
- => $@"{GetSectionFromConfigurationExpression(configurationKeyName)}.{Identifier.Path}";
-
- private static string GetSectionFromConfigurationExpression(string configurationKeyName, bool addQuotes = true)
- {
- string argExpr = addQuotes ? $@"""{configurationKeyName}""" : configurationKeyName;
- return $@"{Expression.configurationGetSection}({argExpr})";
- }
-
- private static string GetConfigKeyCacheFieldName(ObjectSpec type) =>
- $"s_configKeys_{type.DisplayStringWithoutSpecialCharacters}";
-
- private void Emit_NotSupportedException_TypeNotDetectedAsInput() =>
- _writer.WriteLine(@$"throw new global::System.NotSupportedException($""{string.Format(ExceptionMessages.TypeNotDetectedAsInput, "{type}")}"");");
- }
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsBuilderConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsBuilderConfigurationExtensions.cs
deleted file mode 100644
index 71d0b6989dd970..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsBuilderConfigurationExtensions.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- public sealed partial class ConfigurationBindingGenerator
- {
- private sealed partial class Emitter
- {
- private bool ShouldEmitMethods(MethodsToGen_Extensions_OptionsBuilder methods) => (_sourceGenSpec.MethodsToGen_OptionsBuilderExt & methods) != 0;
-
- private void EmitBinder_Extensions_OptionsBuilder()
- {
- if (!ShouldEmitMethods(MethodsToGen_Extensions_OptionsBuilder.Any))
- {
- return;
- }
-
- EmitRootBindingClassStartBlock(Identifier.GeneratedOptionsBuilderBinder);
-
- EmitBindMethods_Extensions_OptionsBuilder();
- EmitBindConfigurationMethod();
-
- EmitEndBlock();
- }
-
- private void EmitBindMethods_Extensions_OptionsBuilder()
- {
- if (!ShouldEmitMethods(MethodsToGen_Extensions_OptionsBuilder.Bind))
- {
- return;
- }
-
- const string documentation = @"/// Registers a configuration instance which will bind against.";
- const string paramList = $"{FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}";
-
- if (ShouldEmitMethods(MethodsToGen_Extensions_OptionsBuilder.Bind_T))
- {
- EmitMethodStartBlock("Bind", paramList, documentation);
- _writer.WriteLine($"return global::{Identifier.GeneratedOptionsBuilderBinder}.Bind({Identifier.optionsBuilder}, {Identifier.configuration}, {Identifier.configureOptions}: null);");
- EmitEndBlock();
- }
-
- EmitMethodStartBlock(
- "Bind",
- paramList + $", {FullyQualifiedDisplayString.ActionOfBinderOptions}? {Identifier.configureOptions}",
- documentation);
-
- EmitCheckForNullArgument_WithBlankLine(Identifier.optionsBuilder);
-
- _writer.WriteLine($$"""
- global::{{Identifier.GeneratedServiceCollectionBinder}}.{{Identifier.Configure}}<{{Identifier.TOptions}}>({{Identifier.optionsBuilder}}.{{Identifier.Services}}, {{Identifier.optionsBuilder}}.Name, {{Identifier.configuration}}, {{Identifier.configureOptions}});
- return {{Identifier.optionsBuilder}};
- """);
-
- EmitEndBlock();
- }
-
- private void EmitBindConfigurationMethod()
- {
- if (!ShouldEmitMethods(MethodsToGen_Extensions_OptionsBuilder.BindConfiguration_T_path_BinderOptions))
- {
- return;
- }
-
- const string documentation = $@"/// Registers the dependency injection container to bind against the obtained from the DI service provider.";
- string paramList = $"string {Identifier.configSectionPath}, {FullyQualifiedDisplayString.ActionOfBinderOptions}? {Identifier.configureOptions} = null";
-
- EmitMethodStartBlock("BindConfiguration", paramList, documentation);
-
- EmitCheckForNullArgument_WithBlankLine(Identifier.optionsBuilder);
- EmitCheckForNullArgument_WithBlankLine(Identifier.configSectionPath);
-
- EmitStartBlock($"{Identifier.optionsBuilder}.{Identifier.Configure}<{FullyQualifiedDisplayString.IConfiguration}>(({Identifier.obj}, {Identifier.configuration}) =>");
-
- _writer.WriteLine($$"""
- {{FullyQualifiedDisplayString.IConfiguration}} {{Identifier.section}} = string.Equals(string.Empty, {{Identifier.configSectionPath}}, global::System.StringComparison.OrdinalIgnoreCase) ? {{Identifier.configuration}} : {{Identifier.configuration}}.{{Identifier.GetSection}}({{Identifier.configSectionPath}});
- {{FullyQualifiedDisplayString.CoreBindingHelper}}.{{nameof(MethodsToGen_CoreBindingHelper.BindCoreUntyped)}}({{Identifier.section}}, {{Identifier.obj}}, typeof({{Identifier.TOptions}}), {{Identifier.configureOptions}});
- """);
-
- EmitEndBlock(endBraceTrailingSource: ");");
-
- _writer.WriteLine();
-
- _writer.WriteLine($$"""
- {{FullyQualifiedDisplayString.AddSingleton}}<{{FullyQualifiedDisplayString.IOptionsChangeTokenSource}}<{{Identifier.TOptions}}>, {{FullyQualifiedDisplayString.ConfigurationChangeTokenSource}}<{{Identifier.TOptions}}>>({{Identifier.optionsBuilder}}.{{Identifier.Services}});
- return {{Identifier.optionsBuilder}};
- """);
-
- EmitEndBlock();
- }
-
- private void EmitMethodStartBlock(string methodName, string paramList, string documentation)
- {
- paramList = $"this {FullyQualifiedDisplayString.OptionsBuilderOfTOptions} {Identifier.optionsBuilder}, {paramList}";
-
- EmitBlankLineIfRequired();
- _writer.WriteLine(documentation);
- EmitStartBlock($"public static {FullyQualifiedDisplayString.OptionsBuilderOfTOptions} {methodName}<{Identifier.TOptions}>({paramList}) where {Identifier.TOptions} : class");
- }
- }
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
deleted file mode 100644
index f4cd4800df1230..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- public sealed partial class ConfigurationBindingGenerator
- {
- private sealed partial class Emitter
- {
- private bool ShouldEmitMethods(MethodsToGen_Extensions_ServiceCollection methods) => (_sourceGenSpec.MethodsToGen_ServiceCollectionExt & methods) != 0;
-
- private void EmitBinder_Extensions_IServiceCollection()
- {
- if (!ShouldEmitMethods(MethodsToGen_Extensions_ServiceCollection.Any))
- {
- return;
- }
-
- EmitRootBindingClassStartBlock(Identifier.GeneratedServiceCollectionBinder);
-
- const string defaultNameExpr = "string.Empty";
- const string configureMethodString = $"global::{Identifier.GeneratedServiceCollectionBinder}.{Identifier.Configure}";
- string configParam = $"{FullyQualifiedDisplayString.IConfiguration} {Identifier.configuration}";
-
- if (ShouldEmitMethods(MethodsToGen_Extensions_ServiceCollection.Configure_T))
- {
- EmitStartMethod(configParam);
- _writer.WriteLine($"return {configureMethodString}<{Identifier.TOptions}>({Identifier.services}, {defaultNameExpr}, {Identifier.configuration}, {Identifier.configureOptions}: null);");
- EmitEndBlock();
- }
-
- if (ShouldEmitMethods(MethodsToGen_Extensions_ServiceCollection.Configure_T_name))
- {
- EmitStartMethod(
- paramList: $"string? {Identifier.name}, " + configParam);
- _writer.WriteLine($"return {configureMethodString}<{Identifier.TOptions}>({Identifier.services}, {Identifier.name}, {Identifier.configuration}, {Identifier.configureOptions}: null);");
- EmitEndBlock();
- }
-
- if (ShouldEmitMethods(MethodsToGen_Extensions_ServiceCollection.Configure_T_BinderOptions))
- {
- EmitStartMethod(
- paramList: configParam + $", {FullyQualifiedDisplayString.ActionOfBinderOptions}? {Identifier.configureOptions}");
- _writer.WriteLine($"return {configureMethodString}<{Identifier.TOptions}>({Identifier.services}, {defaultNameExpr}, {Identifier.configuration}, {Identifier.configureOptions});");
- EmitEndBlock();
- }
-
- // Core Configure method that the other overloads call.
- // Like the others, it is public API that could be called directly by users.
- // So, it is always generated whenever a Configure overload is called.
- string optionsNamespaceName = "global::Microsoft.Extensions.Options";
- string bindCoreUntypedDisplayString = GetHelperMethodDisplayString(nameof(MethodsToGen_CoreBindingHelper.BindCoreUntyped));
-
- EmitStartMethod(paramList: $"string? {Identifier.name}, " + configParam + $", {FullyQualifiedDisplayString.ActionOfBinderOptions}? {Identifier.configureOptions}");
- EmitCheckForNullArgument_WithBlankLine(Identifier.services);
- EmitCheckForNullArgument_WithBlankLine(Identifier.configuration);
- _writer.WriteLine($$"""
- global::Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.AddOptions({{Identifier.services}});
- {{FullyQualifiedDisplayString.AddSingleton}}<{{FullyQualifiedDisplayString.IOptionsChangeTokenSource}}<{{Identifier.TOptions}}>>({{Identifier.services}}, new {{FullyQualifiedDisplayString.ConfigurationChangeTokenSource}}<{{Identifier.TOptions}}>({{Identifier.name}}, {{Identifier.configuration}}));
- return {{FullyQualifiedDisplayString.AddSingleton}}<{{optionsNamespaceName}}.IConfigureOptions<{{Identifier.TOptions}}>>({{Identifier.services}}, new {{optionsNamespaceName}}.ConfigureNamedOptions<{{Identifier.TOptions}}>({{Identifier.name}}, {{Identifier.obj}} => {{bindCoreUntypedDisplayString}}({{Identifier.configuration}}, {{Identifier.obj}}, typeof({{Identifier.TOptions}}), {{Identifier.configureOptions}})));
- """);
- EmitEndBlock();
-
- EmitEndBlock();
- _emitBlankLineBeforeNextStatement = true;
- }
-
- private void EmitStartMethod(string paramList)
- {
- paramList = $"this {FullyQualifiedDisplayString.IServiceCollection} {Identifier.services}, {paramList}";
-
- EmitBlankLineIfRequired();
- EmitStartBlock($$"""
- /// Registers a configuration instance which TOptions will bind against.
- public static {{FullyQualifiedDisplayString.IServiceCollection}} {{Identifier.Configure}}<{{Identifier.TOptions}}>({{paramList}}) where {{Identifier.TOptions}} : class
- """);
- }
- }
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/MethodsToGen.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/MethodsToGen.cs
deleted file mode 100644
index 7b40f198e08f23..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/MethodsToGen.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- [Flags]
- public enum MethodsToGen_CoreBindingHelper
- {
- None = 0x0,
- BindCore = 0x1,
- BindCoreUntyped = 0x2,
- GetCore = 0x4,
- GetValueCore = 0x8,
- Initialize = 0x10,
- AsConfigWithChildren = 0x20,
- }
-
- ///
- /// Methods on Microsoft.Extensions.Configuration.ConfigurationBinder
- ///
- [Flags]
- internal enum MethodsToGen_ConfigurationBinder
- {
- None = 0x0,
-
- ///
- /// Bind(IConfiguration, object).
- ///
- Bind_instance = 0x1,
-
- ///
- /// Bind(IConfiguration, object, Action).
- ///
- Bind_instance_BinderOptions = 0x2,
-
- ///
- /// Bind(IConfiguration, string, object).
- ///
- Bind_key_instance = 0x4,
-
- ///
- /// Get(IConfiguration).
- ///
- Get_T = 0x8,
-
- ///
- /// Get(IConfiguration, Action).
- ///
- Get_T_BinderOptions = 0x10,
-
- ///
- /// Get(IConfiguration, Type).
- ///
- Get_TypeOf = 0x20,
-
- ///
- /// Get(IConfiguration, Type, Action).
- ///
- Get_TypeOf_BinderOptions = 0x40,
-
- ///
- /// GetValue(IConfiguration, Type, string).
- ///
- GetValue_TypeOf_key = 0x80,
-
- ///
- /// GetValue(IConfiguration, Type, object).
- ///
- GetValue_TypeOf_key_defaultValue = 0x100,
-
- ///
- /// GetValue(IConfiguration, string).
- ///
- GetValue_T_key = 0x200,
-
- ///
- /// GetValue(IConfiguration, string, T).
- ///
- GetValue_T_key_defaultValue = 0x400,
-
- // Method groups
- Bind = Bind_instance | Bind_instance_BinderOptions | Bind_key_instance,
- Get = Get_T | Get_T_BinderOptions | Get_TypeOf | Get_TypeOf_BinderOptions,
- GetValue = GetValue_T_key | GetValue_T_key_defaultValue | GetValue_TypeOf_key | GetValue_TypeOf_key_defaultValue,
-
- Any = Bind | Get | GetValue,
- }
-
- [Flags]
- internal enum MethodsToGen_Extensions_OptionsBuilder
- {
- None = 0x0,
-
- ///
- /// Bind(OptionsBuilder, IConfiguration).
- ///
- Bind_T = 0x1,
-
- ///
- /// Bind(OptionsBuilder, IConfiguration, Action?).
- ///
- Bind_T_BinderOptions = 0x2,
-
- ///
- /// BindConfiguration(OptionsBuilder, string, Action?).
- ///
- BindConfiguration_T_path_BinderOptions = 0x4,
-
- // Method group. BindConfiguration_T is its own method group.
- Bind = Bind_T | Bind_T_BinderOptions,
-
- BindConfiguration = BindConfiguration_T_path_BinderOptions,
-
- Any = Bind | BindConfiguration,
- }
-
- ///
- /// Methods on Microsoft.Extensions.DependencyInjection.OptionsConfigurationServiceCollectionExtensions
- ///
- [Flags]
- public enum MethodsToGen_Extensions_ServiceCollection
- {
- None = 0x0,
-
- ///
- /// Configure(IServiceCollection, IConfiguration).
- ///
- Configure_T = 0x1,
-
- ///
- /// Configure(IServiceCollection, string, IConfiguration).
- ///
- Configure_T_name = 0x2,
-
- ///
- /// Configure(IServiceCollection, IConfiguration, Action?).
- ///
- Configure_T_BinderOptions = 0x4,
-
- ///
- /// Configure(IServiceCollection, string, IConfiguration, Action?).
- ///
- Configure_T_name_BinderOptions = 0x8,
-
- Configure = Configure_T | Configure_T_name | Configure_T_BinderOptions | Configure_T_name_BinderOptions,
-
- Any = Configure,
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs
deleted file mode 100644
index 3029a8de34f9e8..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Threading;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Operations;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal sealed record BinderInvocation
- {
- public IInvocationOperation Operation { get; private set; }
- public Location? Location { get; private set; }
-
- public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
- {
- if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
- context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
- !IsCandidateInvocation(operation))
- {
- return null;
- }
-
- return new BinderInvocation()
- {
- Operation = operation,
- Location = invocationSyntax.GetLocation()
- };
- }
-
- private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
- {
- if (node is InvocationExpressionSyntax
- {
- Expression: MemberAccessExpressionSyntax
- {
- Name.Identifier.ValueText: string memberName
- }
- } syntax && IsCandidateBindingMethodName(memberName))
- {
- invocationSyntax = syntax;
- return true;
- }
-
- invocationSyntax = null;
- return false;
-
- static bool IsCandidateBindingMethodName(string name) =>
- IsCandidateMethodName_ConfigurationBinder(name) ||
- IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
- IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
- }
-
- private static bool IsCandidateInvocation(IInvocationOperation operation)
- {
- if (operation.TargetMethod is not IMethodSymbol
- {
- IsExtensionMethod: true,
- Name: string methodName,
- ContainingType: ITypeSymbol
- {
- Name: string containingTypeName,
- ContainingNamespace: INamespaceSymbol { } containingNamespace,
- } containingType
- } method ||
- containingNamespace.ToDisplayString() is not string containingNamespaceName)
- {
- return false;
- }
-
- return (containingTypeName) switch
- {
- "ConfigurationBinder" =>
- containingNamespaceName is "Microsoft.Extensions.Configuration" &&
- IsCandidateMethodName_ConfigurationBinder(methodName),
- "OptionsBuilderConfigurationExtensions" =>
- containingNamespaceName is "Microsoft.Extensions.DependencyInjection" &&
- IsCandidateMethodName_OptionsBuilderConfigurationExtensions(methodName),
- "OptionsConfigurationServiceCollectionExtensions" =>
- containingNamespaceName is "Microsoft.Extensions.DependencyInjection" &&
- IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(methodName),
- _ => false,
- };
- }
-
- private static bool IsCandidateMethodName_ConfigurationBinder(string name) => name is
- nameof(MethodsToGen_ConfigurationBinder.Bind) or
- nameof(MethodsToGen_ConfigurationBinder.Get) or
- nameof(MethodsToGen_ConfigurationBinder.GetValue);
-
- private static bool IsCandidateMethodName_OptionsBuilderConfigurationExtensions(string name) => name is
- nameof(MethodsToGen_Extensions_OptionsBuilder.Bind) or
- nameof(MethodsToGen_Extensions_OptionsBuilder.BindConfiguration);
-
- private static bool IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(string name) => name is
- nameof(MethodsToGen_Extensions_ServiceCollection.Configure);
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/OptionsBuilderConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/OptionsBuilderConfigurationExtensions.cs
deleted file mode 100644
index d01e80d708ca11..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/OptionsBuilderConfigurationExtensions.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Immutable;
-using System.Diagnostics;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Operations;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- public sealed partial class ConfigurationBindingGenerator
- {
- private sealed partial class Parser
- {
- private void RegisterMethodInvocation_OptionsBuilderExt(BinderInvocation invocation)
- {
- IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
- ImmutableArray @params = targetMethod.Parameters;
-
- if (!targetMethod.IsGenericMethod ||
- @params.Length < 2 ||
- @params[0].Type is not INamedTypeSymbol { IsGenericType: true } genericType ||
- !SymbolEqualityComparer.Default.Equals(_typeSymbols.OptionsBuilderOfT_Unbound, genericType.ConstructUnboundGenericType()))
- {
- return;
- }
-
- TypeSpec typeSpec = GetTargetTypeForRootInvocation(
- type: targetMethod.TypeArguments[0].WithNullableAnnotation(NullableAnnotation.None),
- invocation.Location);
-
- if (typeSpec is null)
- {
- return;
- }
-
- // We are going to emit calls to APIs on IServiceCollection.
- _sourceGenSpec.TypeNamespaces.Add("Microsoft.Extensions.DependencyInjection");
-
- if (targetMethod.Name is "Bind")
- {
- RegisterBindInvocation(invocation, typeSpec);
- }
- else if (targetMethod.Name is "BindConfiguration")
- {
- ParseBindConfigurationInvocation(invocation, typeSpec);
- }
- }
-
- private void RegisterBindInvocation(BinderInvocation invocation, TypeSpec typeSpec)
- {
- IInvocationOperation operation = invocation.Operation!;
- IMethodSymbol targetMethod = operation.TargetMethod;
- ImmutableArray @params = targetMethod.Parameters;
- int paramCount = @params.Length;
-
- Debug.Assert(paramCount >= 2);
-
- if (!SymbolEqualityComparer.Default.Equals(_typeSymbols.IConfiguration, @params[1].Type))
- {
- return;
- }
-
- if (paramCount is 2)
- {
- _sourceGenSpec.MethodsToGen_OptionsBuilderExt |= MethodsToGen_Extensions_OptionsBuilder.Bind_T;
- }
- else if (paramCount is 3 && SymbolEqualityComparer.Default.Equals(_typeSymbols.ActionOfBinderOptions, @params[2].Type))
- {
- _sourceGenSpec.MethodsToGen_OptionsBuilderExt |= MethodsToGen_Extensions_OptionsBuilder.Bind_T_BinderOptions;
- }
- else
- {
- return;
- }
-
- RegisterTypeForMethodGen(MethodsToGen_Extensions_ServiceCollection.Configure_T_name_BinderOptions, typeSpec);
- }
-
- private void ParseBindConfigurationInvocation(BinderInvocation invocation, TypeSpec typeSpec)
- {
- IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
- ImmutableArray @params = targetMethod.Parameters;
-
- int paramCount = @params.Length;
- Debug.Assert(paramCount >= 2);
-
- if (paramCount is 3 && @params[1].Type.SpecialType is SpecialType.System_String && SymbolEqualityComparer.Default.Equals(_typeSymbols.ActionOfBinderOptions, @params[2].Type))
- {
- _sourceGenSpec.MethodsToGen_OptionsBuilderExt |= MethodsToGen_Extensions_OptionsBuilder.BindConfiguration_T_path_BinderOptions;
- RegisterTypeForBindCoreUntypedGen(typeSpec);
- }
- }
- }
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj
index 785a18c5c0978e..764682b43daa86 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj
@@ -9,46 +9,60 @@
$(DefineConstants);LAUNCH_DEBUGGER
+
+
+ $(NetCoreAppToolCurrent);netstandard2.0
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/CollectionSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/CollectionSpec.cs
deleted file mode 100644
index 280ecc4c536482..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/CollectionSpec.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal abstract record CollectionSpec : TypeSpec
- {
- public CollectionSpec(ITypeSymbol type) : base(type) { }
-
- public required TypeSpec ElementType { get; init; }
-
- public CollectionSpec? ConcreteType { get; set; }
-
- public CollectionSpec? PopulationCastType { get; set; }
-
- public required CollectionPopulationStrategy PopulationStrategy { get; init; }
-
- public override bool CanInitialize => ConcreteType?.CanInitialize ?? CanInitComplexObject();
-
- public override required InitializationStrategy InitializationStrategy { get; set; }
-
- public required string? ToEnumerableMethodCall { get; init; }
-
- public sealed override bool NeedsMemberBinding => true;
- }
-
- internal sealed record EnumerableSpec : CollectionSpec
- {
- public EnumerableSpec(ITypeSymbol type) : base(type) { }
-
- public override TypeSpecKind SpecKind => TypeSpecKind.Enumerable;
- }
-
- internal sealed record DictionarySpec : CollectionSpec
- {
- public DictionarySpec(INamedTypeSymbol type) : base(type) { }
-
- public override TypeSpecKind SpecKind => TypeSpecKind.Dictionary;
-
- public required ParsableFromStringSpec KeyType { get; init; }
- }
-
- internal enum CollectionPopulationStrategy
- {
- Unknown = 0,
- Add = 1,
- Cast_Then_Add = 2,
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ConfigurationSectionSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ConfigurationSectionSpec.cs
deleted file mode 100644
index ed1fcac7636ba7..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ConfigurationSectionSpec.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal sealed record ConfigurationSectionSpec : TypeSpec
- {
- public ConfigurationSectionSpec(ITypeSymbol type) : base(type) { }
-
- public override TypeSpecKind SpecKind => TypeSpecKind.IConfigurationSection;
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/InitializationStrategy.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/InitializationStrategy.cs
deleted file mode 100644
index 866dd254e0181e..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/InitializationStrategy.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal enum InitializationStrategy
- {
- None = 0,
- ParameterlessConstructor = 1,
- ParameterizedConstructor = 2,
- ToEnumerableMethod = 3,
- Array = 4,
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/NullableSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/NullableSpec.cs
deleted file mode 100644
index 9dcca27596e7ee..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/NullableSpec.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal sealed record NullableSpec : TypeSpec
- {
- private readonly TypeSpec _underlyingType;
-
- public NullableSpec(ITypeSymbol type, TypeSpec underlyingType) : base(type)
- {
- _underlyingType = underlyingType;
- }
-
- public override TypeSpecKind SpecKind => TypeSpecKind.Nullable;
-
- public override TypeSpec EffectiveType => _underlyingType;
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ObjectSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ObjectSpec.cs
deleted file mode 100644
index 1696ee099fe469..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ObjectSpec.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal sealed record ObjectSpec : TypeSpec
- {
- public ObjectSpec(INamedTypeSymbol type) : base(type) { }
-
- public override TypeSpecKind SpecKind => TypeSpecKind.Object;
-
- public override InitializationStrategy InitializationStrategy { get; set; }
-
- public override bool CanInitialize => CanInitComplexObject();
-
- public Dictionary Properties { get; } = new(StringComparer.OrdinalIgnoreCase);
-
- public List ConstructorParameters { get; } = new();
-
- private string _displayStringWithoutSpecialCharacters;
- public string DisplayStringWithoutSpecialCharacters =>
- _displayStringWithoutSpecialCharacters ??= $"{MinimalDisplayString.Replace(".", string.Empty).Replace("<", string.Empty).Replace(">", string.Empty)}";
-
- public override bool NeedsMemberBinding => CanInitialize &&
- Properties.Values.Count > 0 &&
- Properties.Values.Any(p => p.ShouldBind());
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ParsableFromStringSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ParsableFromStringSpec.cs
deleted file mode 100644
index 6b5bb5b61ea371..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ParsableFromStringSpec.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Diagnostics;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal sealed record ParsableFromStringSpec : TypeSpec
- {
- public ParsableFromStringSpec(ITypeSymbol type) : base(type) { }
-
- public override TypeSpecKind SpecKind => TypeSpecKind.ParsableFromString;
-
- public required StringParsableTypeKind StringParsableTypeKind { get; init; }
-
- private string? _parseMethodName;
- public string ParseMethodName
- {
- get
- {
- Debug.Assert(StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue);
-
- _parseMethodName ??= StringParsableTypeKind is StringParsableTypeKind.ByteArray
- ? "ParseByteArray"
- // MinimalDisplayString.Length is certainly > 2.
- : $"Parse{(char.ToUpper(MinimalDisplayString[0]) + MinimalDisplayString.Substring(1)).Replace(".", "")}";
-
- return _parseMethodName;
- }
- }
- }
-
- internal enum StringParsableTypeKind
- {
- None = 0,
-
- ///
- /// Declared types that can be assigned directly from IConfigurationSection.Value, i.e. string and tyepof(object).
- ///
- AssignFromSectionValue = 1,
- Enum = 2,
- ByteArray = 3,
- Integer = 4,
- Float = 5,
- Parse = 6,
- ParseInvariant = 7,
- CultureInfo = 8,
- Uri = 9,
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/SourceGenerationSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/SourceGenerationSpec.cs
deleted file mode 100644
index 88c4b24f57a5ea..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/SourceGenerationSpec.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal sealed record SourceGenerationSpec
- {
- public Dictionary> TypesForGen_CoreBindingHelper_Methods { get; } = new();
- public Dictionary> TypesForGen_ConfigurationBinder_BindMethods { get; } = new();
-
- public HashSet PrimitivesForHelperGen { get; } = new();
- public HashSet TypeNamespaces { get; } = new()
- {
- "System",
- "System.CodeDom.Compiler",
- "System.Globalization",
- "Microsoft.Extensions.Configuration",
- };
-
- public MethodsToGen_CoreBindingHelper MethodsToGen_CoreBindingHelper { get; set; }
- public MethodsToGen_ConfigurationBinder MethodsToGen_ConfigurationBinder { get; set; }
- public MethodsToGen_Extensions_OptionsBuilder MethodsToGen_OptionsBuilderExt { get; set; }
- public MethodsToGen_Extensions_ServiceCollection MethodsToGen_ServiceCollectionExt { get; set; }
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/TypeSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/TypeSpec.cs
deleted file mode 100644
index 6a6292b7ebd0b4..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/TypeSpec.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
-{
- internal abstract record TypeSpec
- {
- private static readonly SymbolDisplayFormat s_minimalDisplayFormat = new SymbolDisplayFormat(
- globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
- typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypes,
- genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
- miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
-
- public TypeSpec(ITypeSymbol type)
- {
- IsValueType = type.IsValueType;
- Namespace = type.ContainingNamespace?.ToDisplayString();
- FullyQualifiedDisplayString = type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
- MinimalDisplayString = type.ToDisplayString(s_minimalDisplayFormat);
- Name = Namespace + "." + MinimalDisplayString.Replace(".", "+");
- IsInterface = type.TypeKind is TypeKind.Interface;
- }
-
- public string Name { get; }
-
- public string FullyQualifiedDisplayString { get; }
-
- public string MinimalDisplayString { get; }
-
- public string? Namespace { get; }
-
- public bool IsValueType { get; }
-
- public abstract TypeSpecKind SpecKind { get; }
-
- public virtual InitializationStrategy InitializationStrategy { get; set; }
-
- public virtual string? InitExceptionMessage { get; set; }
-
- public virtual bool CanInitialize => true;
-
- public virtual bool NeedsMemberBinding { get; }
-
- public virtual TypeSpec EffectiveType => this;
-
- public bool IsInterface { get; }
-
- protected bool CanInitComplexObject() => InitializationStrategy is not InitializationStrategy.None && InitExceptionMessage is null;
- }
-
- internal enum TypeSpecKind
- {
- Unknown = 0,
- ParsableFromString = 1,
- Object = 2,
- Enumerable = 3,
- Dictionary = 4,
- IConfigurationSection = 5,
- Nullable = 6,
- }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/BinderInvocation.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/BinderInvocation.cs
new file mode 100644
index 00000000000000..b1cf51acb3b4a6
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/BinderInvocation.cs
@@ -0,0 +1,91 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Operations;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ internal sealed class BinderInvocation
+ {
+ private BinderInvocation(IInvocationOperation operation, Location location)
+ {
+ Operation = operation;
+ Location = location;
+ }
+
+ public IInvocationOperation Operation { get; }
+ public Location Location { get; }
+
+ public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
+ {
+ Debug.Assert(IsCandidateSyntaxNode(context.Node));
+ InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;
+
+ return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
+ IsBindingOperation(operation)
+ ? new BinderInvocation(operation, invocationSyntax.GetLocation())
+ : null;
+ }
+
+ public static bool IsCandidateSyntaxNode(SyntaxNode node)
+ {
+ return node is InvocationExpressionSyntax
+ {
+ // TODO: drill further into this evaluation for a declaring-type name check.
+ // https://github.com/dotnet/runtime/issues/90687.
+ Expression: MemberAccessExpressionSyntax
+ {
+ Name.Identifier.ValueText: string memberName,
+ }
+ } && IsCandidateBindingMethodName(memberName);
+
+ static bool IsCandidateBindingMethodName(string name) =>
+ IsValidMethodName_ConfigurationBinder(name) ||
+ IsValidMethodName_OptionsBuilderConfigurationExtensions(name) ||
+ IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
+ }
+
+ public static bool IsBindingOperation(IInvocationOperation operation)
+ {
+ if (operation.TargetMethod is not IMethodSymbol
+ {
+ IsExtensionMethod: true,
+ Name: string methodName,
+ ContainingType: INamedTypeSymbol
+ {
+ Name: string containingTypeName,
+ ContainingNamespace: INamespaceSymbol containingNamespace,
+ }
+ })
+ {
+ return false;
+ }
+
+ string containingNamespaceName = containingNamespace.ToDisplayString();
+
+ return (containingTypeName) switch
+ {
+ "ConfigurationBinder" =>
+ containingNamespaceName is "Microsoft.Extensions.Configuration" &&
+ IsValidMethodName_ConfigurationBinder(methodName),
+ "OptionsBuilderConfigurationExtensions" =>
+ containingNamespaceName is "Microsoft.Extensions.DependencyInjection" &&
+ IsValidMethodName_OptionsBuilderConfigurationExtensions(methodName),
+ "OptionsConfigurationServiceCollectionExtensions" =>
+ containingNamespaceName is "Microsoft.Extensions.DependencyInjection" &&
+ IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(methodName),
+ _ => false,
+ };
+ }
+
+ private static bool IsValidMethodName_ConfigurationBinder(string name) => name is "Bind" or "Get" or "GetValue";
+
+ private static bool IsValidMethodName_OptionsBuilderConfigurationExtensions(string name) => name is "Bind" or "BindConfiguration";
+
+ private static bool IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(string name) => name is "Configure";
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/ConfigurationBinder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/ConfigurationBinder.cs
similarity index 54%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/ConfigurationBinder.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/ConfigurationBinder.cs
index a663c441c55ce3..645786e35c1c55 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/ConfigurationBinder.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/ConfigurationBinder.cs
@@ -2,43 +2,41 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
-using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;
+using System.Diagnostics;
namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
public sealed partial class ConfigurationBindingGenerator
{
- private sealed partial class Parser
+ internal sealed partial class Parser
{
- private void RegisterMethodInvocation_ConfigurationBinder(BinderInvocation invocation)
+ private void ParseInvocation_ConfigurationBinder(BinderInvocation invocation)
{
switch (invocation.Operation.TargetMethod.Name)
{
- case nameof(MethodsToGen_ConfigurationBinder.Bind):
+ case "Bind":
{
- RegisterBindInvocation(invocation);
+ ParseBindInvocation_ConfigurationBinder(invocation);
}
break;
- case nameof(MethodsToGen_ConfigurationBinder.Get):
+ case "Get":
{
- RegisterGetInvocation(invocation);
+ ParseGetInvocation(invocation);
}
break;
- case nameof(MethodsToGen_ConfigurationBinder.GetValue):
+ case "GetValue":
{
- RegisterGetValueInvocation(invocation);
+ ParseGetValueInvocation(invocation);
}
break;
- default:
- return;
}
}
- private void RegisterBindInvocation(BinderInvocation invocation)
+ private void ParseBindInvocation_ConfigurationBinder(BinderInvocation invocation)
{
IInvocationOperation operation = invocation.Operation!;
ImmutableArray @params = operation.TargetMethod.Parameters;
@@ -49,69 +47,58 @@ private void RegisterBindInvocation(BinderInvocation invocation)
return;
}
- MethodsToGen_ConfigurationBinder overload = MethodsToGen_ConfigurationBinder.None;
+ MethodsToGen overload = MethodsToGen.None;
if (paramCount is 2)
{
- overload = MethodsToGen_ConfigurationBinder.Bind_instance;
+ overload = MethodsToGen.ConfigBinder_Bind_instance;
}
else if (paramCount is 3)
{
if (@params[1].Type.SpecialType is SpecialType.System_String)
{
- overload = MethodsToGen_ConfigurationBinder.Bind_key_instance;
+ overload = MethodsToGen.ConfigBinder_Bind_key_instance;
}
else if (SymbolEqualityComparer.Default.Equals(@params[2].Type, _typeSymbols.ActionOfBinderOptions))
{
- overload = MethodsToGen_ConfigurationBinder.Bind_instance_BinderOptions;
+ overload = MethodsToGen.ConfigBinder_Bind_instance_BinderOptions;
}
}
- if (overload is MethodsToGen_ConfigurationBinder.None)
+ if (overload is MethodsToGen.None)
{
return;
}
- int objectIndex = overload switch
+ int instanceIndex = overload switch
{
- MethodsToGen_ConfigurationBinder.Bind_instance => 1,
- MethodsToGen_ConfigurationBinder.Bind_instance_BinderOptions => 1,
- MethodsToGen_ConfigurationBinder.Bind_key_instance => 2,
+ MethodsToGen.ConfigBinder_Bind_instance => 1,
+ MethodsToGen.ConfigBinder_Bind_instance_BinderOptions => 1,
+ MethodsToGen.ConfigBinder_Bind_key_instance => 2,
_ => throw new InvalidOperationException()
};
- IArgumentOperation objectArg = operation.Arguments[objectIndex];
- if (objectArg.Parameter.Type.SpecialType != SpecialType.System_Object)
+ IArgumentOperation instanceArg = GetArgumentForParameterAtIndex(operation.Arguments, instanceIndex);
+ if (instanceArg.Parameter?.Type.SpecialType is not SpecialType.System_Object)
{
return;
}
- ITypeSymbol? type = ResolveType(objectArg.Value)?.WithNullableAnnotation(NullableAnnotation.None);
+ ITypeSymbol? type = ResolveType(instanceArg.Value)?.WithNullableAnnotation(NullableAnnotation.None);
if (!IsValidRootConfigType(type))
{
- _context.ReportDiagnostic(Diagnostic.Create(Diagnostics.CouldNotDetermineTypeInfo, invocation.Location));
+ RecordDiagnostic(DiagnosticDescriptors.CouldNotDetermineTypeInfo, invocation.Location);
return;
}
- if (type!.IsValueType)
+ if (type.IsValueType)
{
- _context.ReportDiagnostic(Diagnostic.Create(Diagnostics.ValueTypesInvalidForBind, invocation.Location, type));
+ RecordDiagnostic(DiagnosticDescriptors.ValueTypesInvalidForBind, invocation.Location, messageArgs: new object[] { type });
return;
}
- if (GetTargetTypeForRootInvocationCore(type, invocation.Location) is TypeSpec typeSpec)
- {
- Dictionary> types = _sourceGenSpec.TypesForGen_ConfigurationBinder_BindMethods;
-
- if (!types.TryGetValue(overload, out HashSet? typeSpecs))
- {
- types[overload] = typeSpecs = new HashSet();
- }
-
- _sourceGenSpec.MethodsToGen_ConfigurationBinder |= overload;
- typeSpecs.Add(typeSpec);
- }
+ EnqueueTargetTypeForRootInvocation(type, overload, invocation);
static ITypeSymbol? ResolveType(IOperation conversionOperation) =>
conversionOperation switch
@@ -130,7 +117,20 @@ private void RegisterBindInvocation(BinderInvocation invocation)
};
}
- private void RegisterGetInvocation(BinderInvocation invocation)
+ private static IArgumentOperation GetArgumentForParameterAtIndex(ImmutableArray arguments, int parameterIndex)
+ {
+ foreach (var argument in arguments)
+ {
+ if (argument.Parameter?.Ordinal == parameterIndex)
+ {
+ return argument;
+ }
+ }
+
+ throw new InvalidOperationException();
+ }
+
+ private void ParseGetInvocation(BinderInvocation invocation)
{
IInvocationOperation operation = invocation.Operation!;
IMethodSymbol targetMethod = operation.TargetMethod;
@@ -142,7 +142,7 @@ private void RegisterGetInvocation(BinderInvocation invocation)
return;
}
- MethodsToGen_ConfigurationBinder overload = MethodsToGen_ConfigurationBinder.None;
+ MethodsToGen overload = MethodsToGen.None;
ITypeSymbol? type;
if (targetMethod.IsGenericMethod)
@@ -156,11 +156,11 @@ private void RegisterGetInvocation(BinderInvocation invocation)
if (paramCount is 1)
{
- overload = MethodsToGen_ConfigurationBinder.Get_T;
+ overload = MethodsToGen.ConfigBinder_Get_T;
}
else if (paramCount is 2 && SymbolEqualityComparer.Default.Equals(@params[1].Type, _typeSymbols.ActionOfBinderOptions))
{
- overload = MethodsToGen_ConfigurationBinder.Get_T_BinderOptions;
+ overload = MethodsToGen.ConfigBinder_Get_T_BinderOptions;
}
}
else if (paramCount > 3)
@@ -169,35 +169,30 @@ private void RegisterGetInvocation(BinderInvocation invocation)
}
else
{
- ITypeOfOperation? typeOfOperation = operation.Arguments[1].ChildOperations.FirstOrDefault() as ITypeOfOperation;
+ ITypeOfOperation? typeOfOperation = GetArgumentForParameterAtIndex(operation.Arguments, 1).ChildOperations.FirstOrDefault() as ITypeOfOperation;
type = typeOfOperation?.TypeOperand;
if (paramCount is 2)
{
- overload = MethodsToGen_ConfigurationBinder.Get_TypeOf;
+ overload = MethodsToGen.ConfigBinder_Get_TypeOf;
}
else if (paramCount is 3 && SymbolEqualityComparer.Default.Equals(@params[2].Type, _typeSymbols.ActionOfBinderOptions))
{
- overload = MethodsToGen_ConfigurationBinder.Get_TypeOf_BinderOptions;
+ overload = MethodsToGen.ConfigBinder_Get_TypeOf_BinderOptions;
}
}
- if (GetTargetTypeForRootInvocation(type, invocation.Location) is TypeSpec typeSpec)
- {
- _sourceGenSpec.MethodsToGen_ConfigurationBinder |= overload;
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.GetCore, typeSpec);
- }
-
+ EnqueueTargetTypeForRootInvocation(type, overload, invocation);
}
- private void RegisterGetValueInvocation(BinderInvocation invocation)
+ private void ParseGetValueInvocation(BinderInvocation invocation)
{
IInvocationOperation operation = invocation.Operation!;
IMethodSymbol targetMethod = operation.TargetMethod;
ImmutableArray @params = targetMethod.Parameters;
int paramCount = @params.Length;
- MethodsToGen_ConfigurationBinder overload = MethodsToGen_ConfigurationBinder.None;
+ MethodsToGen overload = MethodsToGen.None;
ITypeSymbol? type;
if (targetMethod.IsGenericMethod)
@@ -211,11 +206,11 @@ private void RegisterGetValueInvocation(BinderInvocation invocation)
if (paramCount is 2)
{
- overload = MethodsToGen_ConfigurationBinder.GetValue_T_key;
+ overload = MethodsToGen.ConfigBinder_GetValue_T_key;
}
else if (paramCount is 3 && SymbolEqualityComparer.Default.Equals(@params[2].Type, type))
{
- overload = MethodsToGen_ConfigurationBinder.GetValue_T_key_defaultValue;
+ overload = MethodsToGen.ConfigBinder_GetValue_T_key_defaultValue;
}
}
else if (paramCount > 4)
@@ -229,32 +224,60 @@ private void RegisterGetValueInvocation(BinderInvocation invocation)
return;
}
- ITypeOfOperation? typeOfOperation = operation.Arguments[1].ChildOperations.FirstOrDefault() as ITypeOfOperation;
+ ITypeOfOperation? typeOfOperation = GetArgumentForParameterAtIndex(operation.Arguments, 1).ChildOperations.FirstOrDefault() as ITypeOfOperation;
type = typeOfOperation?.TypeOperand;
if (paramCount is 3)
{
- overload = MethodsToGen_ConfigurationBinder.GetValue_TypeOf_key;
+ overload = MethodsToGen.ConfigBinder_GetValue_TypeOf_key;
}
else if (paramCount is 4 && @params[3].Type.SpecialType is SpecialType.System_Object)
{
- overload = MethodsToGen_ConfigurationBinder.GetValue_TypeOf_key_defaultValue;
+ overload = MethodsToGen.ConfigBinder_GetValue_TypeOf_key_defaultValue;
}
}
- ITypeSymbol effectiveType = (IsNullable(type, out ITypeSymbol? underlyingType) ? underlyingType : type)!;
-
if (!IsValidRootConfigType(type))
{
- _context.ReportDiagnostic(Diagnostic.Create(Diagnostics.CouldNotDetermineTypeInfo, invocation.Location));
+ RecordDiagnostic(DiagnosticDescriptors.CouldNotDetermineTypeInfo, invocation.Location);
return;
}
- if (IsParsableFromString(effectiveType, out _) &&
- GetTargetTypeForRootInvocationCore(type, invocation.Location) is TypeSpec typeSpec)
+ ITypeSymbol effectiveType = IsNullable(type, out ITypeSymbol? underlyingType) ? underlyingType : type;
+
+ if (IsParsableFromString(effectiveType, out _))
{
- _sourceGenSpec.MethodsToGen_ConfigurationBinder |= overload;
- RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.GetValueCore, typeSpec);
+ EnqueueTargetTypeForRootInvocation(type, overload, invocation);
+ }
+ }
+
+ private void RegisterInterceptor_ConfigurationBinder(TypeParseInfo typeParseInfo, TypeSpec typeSpec)
+ {
+ MethodsToGen overload = typeParseInfo.BindingOverload;
+ IInvocationOperation invocationOperation = typeParseInfo.BinderInvocation!.Operation;
+ Debug.Assert((MethodsToGen.ConfigBinder_Any & overload) is not 0);
+
+ if ((MethodsToGen.ConfigBinder_Bind & overload) is not 0)
+ {
+ if (typeSpec is ComplexTypeSpec complexTypeSpec &&
+ _helperInfoBuilder!.TryRegisterTransitiveTypesForMethodGen(complexTypeSpec.TypeRef))
+ {
+ _interceptorInfoBuilder.RegisterInterceptor_ConfigBinder_Bind(overload, complexTypeSpec, invocationOperation);
+ }
+ }
+ else
+ {
+ Debug.Assert((MethodsToGen.ConfigBinder_Get & overload) is not 0 ||
+ (MethodsToGen.ConfigBinder_GetValue & overload) is not 0);
+
+ bool registered = (MethodsToGen.ConfigBinder_Get & overload) is not 0
+ ? _helperInfoBuilder!.TryRegisterTypeForGetGen(typeSpec)
+ : _helperInfoBuilder!.TryRegisterTypeForGetValueGen(typeSpec);
+
+ if (registered)
+ {
+ _interceptorInfoBuilder.RegisterInterceptor(overload, invocationOperation);
+ }
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/Diagnostics.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/DiagnosticDescriptors.cs
similarity index 82%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/Diagnostics.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/DiagnosticDescriptors.cs
index d6d816545bcd0a..3f694c78be8309 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/Diagnostics.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/DiagnosticDescriptors.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
public sealed partial class ConfigurationBindingGenerator
{
- private sealed partial class Parser
+ internal sealed partial class Parser
{
- internal static class Diagnostics
+ private static class DiagnosticDescriptors
{
public static DiagnosticDescriptor TypeNotSupported { get; } = CreateTypeNotSupportedDescriptor(nameof(SR.TypeNotSupported));
public static DiagnosticDescriptor MissingPublicInstanceConstructor { get; } = CreateTypeNotSupportedDescriptor(nameof(SR.MissingPublicInstanceConstructor));
@@ -62,6 +62,20 @@ private static DiagnosticDescriptor CreateTypeNotSupportedDescriptor(string name
category: ProjectName,
defaultSeverity: DiagnosticSeverity.Warning,
isEnabledByDefault: true);
+
+ public static DiagnosticDescriptor GetNotSupportedDescriptor(NotSupportedReason reason) =>
+ reason switch
+ {
+ NotSupportedReason.UnknownType => TypeNotSupported,
+ NotSupportedReason.MissingPublicInstanceConstructor => MissingPublicInstanceConstructor,
+ NotSupportedReason.CollectionNotSupported => CollectionNotSupported,
+ NotSupportedReason.DictionaryKeyNotSupported => DictionaryKeyNotSupported,
+ NotSupportedReason.ElementTypeNotSupported => ElementTypeNotSupported,
+ NotSupportedReason.MultipleParameterizedConstructors => MultipleParameterizedConstructors,
+ NotSupportedReason.MultiDimArraysNotSupported => MultiDimArraysNotSupported,
+ NotSupportedReason.NullableUnderlyingTypeNotSupported => NullableUnderlyingTypeNotSupported,
+ _ => throw new InvalidOperationException()
+ };
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/Extensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/Extensions.cs
new file mode 100644
index 00000000000000..f685842639966a
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/Extensions.cs
@@ -0,0 +1,126 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed partial class ConfigurationBindingGenerator
+ {
+ internal sealed partial class Parser
+ {
+ private readonly struct TypeParseInfo
+ {
+ public ITypeSymbol TypeSymbol { get; private init; }
+ public string TypeName { get; private init; }
+ public MethodsToGen BindingOverload { get; private init; }
+ public BinderInvocation BinderInvocation { get; private init; }
+ public ContainingTypeDiagnosticInfo? ContainingTypeDiagnosticInfo { get; private init; }
+
+ public static TypeParseInfo Create(ITypeSymbol typeSymbol, MethodsToGen overload, BinderInvocation invocation, ContainingTypeDiagnosticInfo? containingTypeDiagInfo = null) =>
+ new TypeParseInfo
+ {
+ TypeSymbol = typeSymbol,
+ TypeName = typeSymbol.GetName(),
+ BindingOverload = overload,
+ BinderInvocation = invocation,
+ ContainingTypeDiagnosticInfo = containingTypeDiagInfo,
+ };
+
+ public TypeParseInfo ToTransitiveTypeParseInfo(ITypeSymbol memberType, DiagnosticDescriptor? diagDescriptor = null, string? memberName = null)
+ {
+ ContainingTypeDiagnosticInfo? diagnosticInfo = diagDescriptor is null
+ ? null
+ : new()
+ {
+ TypeName = TypeName,
+ Descriptor = diagDescriptor,
+ MemberName = memberName,
+ ContainingTypeInfo = ContainingTypeDiagnosticInfo,
+ };
+
+ return Create(memberType, BindingOverload, BinderInvocation, diagnosticInfo);
+ }
+ }
+
+ private sealed class ContainingTypeDiagnosticInfo
+ {
+ public required string TypeName { get; init; }
+ public required string? MemberName { get; init; }
+ public required DiagnosticDescriptor Descriptor { get; init; }
+ public required ContainingTypeDiagnosticInfo? ContainingTypeInfo { get; init; }
+ }
+ }
+ }
+
+ internal static class ParserExtensions
+ {
+ private static readonly SymbolDisplayFormat s_identifierCompatibleFormat = new SymbolDisplayFormat(
+ globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+ typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypes,
+ genericsOptions: SymbolDisplayGenericsOptions.None,
+ miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
+ private static readonly SymbolDisplayFormat s_minimalDisplayFormat = new SymbolDisplayFormat(
+ globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+ typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypes,
+ genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+ miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
+ public static void RegisterCacheEntry(this Dictionary cache, TKey key, TEntry entry)
+ where TKey : notnull
+ where TValue : ICollection, new()
+ {
+ if (!cache.TryGetValue(key, out TValue? entryCollection))
+ {
+ cache[key] = entryCollection = new TValue();
+ }
+
+ entryCollection.Add(entry);
+ }
+
+ public static string ToIdentifierCompatibleSubstring(this ITypeSymbol type)
+ {
+ if (type is IArrayTypeSymbol arrayType)
+ {
+ int rank = arrayType.Rank;
+ string suffix = rank == 1 ? "Array" : $"Array{rank}D"; // Array, Array2D, Array3D, ...
+ return ToIdentifierCompatibleSubstring(arrayType.ElementType) + suffix;
+ }
+
+ string displayString = type.ContainingType is null
+ ? type.Name
+ : type.ToDisplayString(s_identifierCompatibleFormat).Replace(".", string.Empty);
+
+ if (type is not INamedTypeSymbol { IsGenericType: true } namedType)
+ {
+ return displayString;
+ }
+
+ StringBuilder sb = new(displayString);
+
+ if (namedType.GetAllTypeArgumentsInScope() is List typeArgsInScope)
+ {
+ foreach (ITypeSymbol genericArg in typeArgsInScope)
+ {
+ sb.Append(ToIdentifierCompatibleSubstring(genericArg));
+ }
+ }
+
+ return sb.ToString();
+ }
+
+ public static (string? Namespace, string DisplayString, string Name) GetTypeName(this ITypeSymbol type)
+ {
+ string? @namespace = type.ContainingNamespace is { IsGlobalNamespace: false } containingNamespace ? containingNamespace.ToDisplayString() : null;
+ string displayString = type.ToDisplayString(s_minimalDisplayFormat);
+ string name = (@namespace is null ? string.Empty : @namespace + ".") + displayString.Replace(".", "+");
+ return (@namespace, displayString, name);
+ }
+
+ public static string GetName(this ITypeSymbol type) => GetTypeName(type).Name;
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/KnownTypeSymbols.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/KnownTypeSymbols.cs
similarity index 94%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/KnownTypeSymbols.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/KnownTypeSymbols.cs
index e3a4f67ed396b4..07dae8689782e4 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/KnownTypeSymbols.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/KnownTypeSymbols.cs
@@ -11,8 +11,10 @@
namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
- internal sealed record KnownTypeSymbols
+ internal sealed class KnownTypeSymbols
{
+ public CSharpCompilation Compilation { get; }
+
public INamedTypeSymbol String { get; }
public INamedTypeSymbol? CultureInfo { get; }
public INamedTypeSymbol? DateOnly { get; }
@@ -35,7 +37,7 @@ internal sealed record KnownTypeSymbols
public INamedTypeSymbol? OptionsConfigurationServiceCollectionExtensions { get; }
public INamedTypeSymbol GenericIList_Unbound { get; }
- public INamedTypeSymbol GenericICollection_Unbound { get; }
+ public INamedTypeSymbol? GenericICollection_Unbound { get; }
public INamedTypeSymbol GenericICollection { get; }
public INamedTypeSymbol GenericIEnumerable_Unbound { get; }
public INamedTypeSymbol IEnumerable { get; }
@@ -57,7 +59,10 @@ internal sealed record KnownTypeSymbols
public KnownTypeSymbols(CSharpCompilation compilation)
{
- // Primitives (needed because they are Microsoft.CodeAnalysis.SpecialType.None)
+ Compilation = compilation;
+
+ // Primitives
+ String = compilation.GetSpecialType(SpecialType.System_String);
CultureInfo = compilation.GetBestTypeByMetadataName(typeof(CultureInfo));
DateOnly = compilation.GetBestTypeByMetadataName("System.DateOnly");
DateTimeOffset = compilation.GetBestTypeByMetadataName(typeof(DateTimeOffset));
@@ -99,7 +104,7 @@ public KnownTypeSymbols(CSharpCompilation compilation)
// Used for type equivalency checks for unbound generics. The parameters of the types
// retured by the Roslyn Get*Type* APIs are not unbound, so we construct unbound
// generics to equal those corresponding to generic types in the input type graphs.
- GenericICollection_Unbound = GenericICollection?.ConstructUnboundGenericType();
+ GenericICollection_Unbound = GenericICollection.ConstructUnboundGenericType();
GenericIDictionary_Unbound = GenericIDictionary?.ConstructUnboundGenericType();
GenericIEnumerable_Unbound = compilation.GetSpecialType(SpecialType.System_Collections_Generic_IEnumerable_T).ConstructUnboundGenericType();
GenericIList_Unbound = compilation.GetSpecialType(SpecialType.System_Collections_Generic_IList_T).ConstructUnboundGenericType();
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/OptionsBuilderConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/OptionsBuilderConfigurationExtensions.cs
new file mode 100644
index 00000000000000..eb0ab086bcd588
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/OptionsBuilderConfigurationExtensions.cs
@@ -0,0 +1,118 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.Diagnostics;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed partial class ConfigurationBindingGenerator
+ {
+ internal sealed partial class Parser
+ {
+ private void ParseInvocation_OptionsBuilderExt(BinderInvocation invocation)
+ {
+ IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
+ ImmutableArray @params = targetMethod.Parameters;
+
+ if (!targetMethod.IsGenericMethod ||
+ @params.Length < 2 ||
+ @params[0].Type is not INamedTypeSymbol { IsGenericType: true } genericType ||
+ !SymbolEqualityComparer.Default.Equals(_typeSymbols.OptionsBuilderOfT_Unbound, genericType.ConstructUnboundGenericType()))
+ {
+ return;
+ }
+
+ ITypeSymbol? typeSymbol = targetMethod.TypeArguments[0].WithNullableAnnotation(NullableAnnotation.None);
+ // This would violate generic type constraint; any such invocation could not have been included in the initial parser.
+ Debug.Assert(typeSymbol?.IsValueType is not true);
+
+ if (targetMethod.Name is "Bind")
+ {
+ ParseBindInvocation_OptionsBuilderExt(invocation, typeSymbol);
+ }
+ else if (targetMethod.Name is "BindConfiguration")
+ {
+ ParseBindConfigurationInvocation(invocation, typeSymbol);
+ }
+ }
+
+ private void ParseBindInvocation_OptionsBuilderExt(BinderInvocation invocation, ITypeSymbol? type)
+ {
+ IInvocationOperation operation = invocation.Operation!;
+ IMethodSymbol targetMethod = operation.TargetMethod;
+ ImmutableArray @params = targetMethod.Parameters;
+ int paramCount = @params.Length;
+
+ Debug.Assert(paramCount >= 2);
+
+ if (!SymbolEqualityComparer.Default.Equals(_typeSymbols.IConfiguration, @params[1].Type))
+ {
+ return;
+ }
+
+ MethodsToGen overload = paramCount switch
+ {
+ 2 => MethodsToGen.OptionsBuilderExt_Bind_T,
+ 3 when SymbolEqualityComparer.Default.Equals(_typeSymbols.ActionOfBinderOptions, @params[2].Type) =>
+ MethodsToGen.OptionsBuilderExt_Bind_T_BinderOptions,
+ _ => MethodsToGen.None
+ };
+
+ if (overload is not MethodsToGen.None)
+ {
+ EnqueueTargetTypeForRootInvocation(type, overload, invocation);
+ }
+ }
+
+ private void ParseBindConfigurationInvocation(BinderInvocation invocation, ITypeSymbol? type)
+ {
+ IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
+ ImmutableArray @params = targetMethod.Parameters;
+
+ int paramCount = @params.Length;
+ Debug.Assert(paramCount >= 2);
+
+ if (paramCount is 3 &&
+ @params[1].Type.SpecialType is SpecialType.System_String &&
+ SymbolEqualityComparer.Default.Equals(_typeSymbols.ActionOfBinderOptions, @params[2].Type))
+ {
+ EnqueueTargetTypeForRootInvocation(type, MethodsToGen.OptionsBuilderExt_BindConfiguration_T_path_BinderOptions, invocation);
+ }
+ }
+
+ private void RegisterInterceptor_OptionsBuilderExt(TypeParseInfo typeParseInfo, TypeSpec typeSpec)
+ {
+ MethodsToGen overload = typeParseInfo.BindingOverload;
+ Debug.Assert((MethodsToGen.OptionsBuilderExt_Any & overload) is not 0);
+
+ if (typeSpec is not ComplexTypeSpec complexTypeSpec)
+ {
+ return;
+ }
+
+ if ((MethodsToGen.OptionsBuilderExt_Bind & overload) is not 0)
+ {
+ if (!TryRegisterTypeForOverloadGen_ServiceCollectionExt(MethodsToGen.ServiceCollectionExt_Configure_T_name_BinderOptions, complexTypeSpec))
+ {
+ return;
+ }
+ }
+ else if (!_helperInfoBuilder!.TryRegisterTypeForBindCoreMainGen(complexTypeSpec))
+ {
+ return;
+ }
+
+ _interceptorInfoBuilder.RegisterInterceptor(typeParseInfo.BindingOverload, typeParseInfo.BinderInvocation.Operation);
+
+ // Emitting refs to IOptionsChangeTokenSource, ConfigurationChangeTokenSource.
+ _helperInfoBuilder!.RegisterNamespace("Microsoft.Extensions.Options");
+
+ // Emitting refs to OptionsBuilder.
+ _helperInfoBuilder!.RegisterNamespace("Microsoft.Extensions.DependencyInjection");
+ }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/OptionsConfigurationServiceCollectionExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/OptionsConfigurationServiceCollectionExtensions.cs
similarity index 54%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/OptionsConfigurationServiceCollectionExtensions.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/OptionsConfigurationServiceCollectionExtensions.cs
index 02c75b4ab653b3..1ccef24bc6b71f 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/OptionsConfigurationServiceCollectionExtensions.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/OptionsConfigurationServiceCollectionExtensions.cs
@@ -10,9 +10,9 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
public sealed partial class ConfigurationBindingGenerator
{
- private sealed partial class Parser
+ internal sealed partial class Parser
{
- private void RegisterMethodInvocation_ServiceCollectionExt(BinderInvocation invocation)
+ private void ParseInvocation_ServiceCollectionExt(BinderInvocation invocation)
{
IInvocationOperation operation = invocation.Operation!;
IMethodSymbol targetMethod = operation.TargetMethod;
@@ -30,11 +30,11 @@ private void RegisterMethodInvocation_ServiceCollectionExt(BinderInvocation invo
return;
}
- MethodsToGen_Extensions_ServiceCollection overload;
+ MethodsToGen overload;
if (paramCount is 2 && SymbolEqualityComparer.Default.Equals(_typeSymbols.IConfiguration, @params[1].Type))
{
- overload = MethodsToGen_Extensions_ServiceCollection.Configure_T;
+ overload = MethodsToGen.ServiceCollectionExt_Configure_T;
}
else if (paramCount is 3)
{
@@ -44,12 +44,12 @@ private void RegisterMethodInvocation_ServiceCollectionExt(BinderInvocation invo
if (secondParamType.SpecialType is SpecialType.System_String &&
SymbolEqualityComparer.Default.Equals(_typeSymbols.IConfiguration, thirdParamType))
{
- overload = MethodsToGen_Extensions_ServiceCollection.Configure_T_name;
+ overload = MethodsToGen.ServiceCollectionExt_Configure_T_name;
}
else if (SymbolEqualityComparer.Default.Equals(_typeSymbols.IConfiguration, secondParamType) &&
SymbolEqualityComparer.Default.Equals(_typeSymbols.ActionOfBinderOptions, thirdParamType))
{
- overload = MethodsToGen_Extensions_ServiceCollection.Configure_T_BinderOptions;
+ overload = MethodsToGen.ServiceCollectionExt_Configure_T_BinderOptions;
}
else
{
@@ -61,7 +61,7 @@ @params[1].Type.SpecialType is SpecialType.System_String &&
SymbolEqualityComparer.Default.Equals(_typeSymbols.IConfiguration, @params[2].Type) &&
SymbolEqualityComparer.Default.Equals(_typeSymbols.ActionOfBinderOptions, @params[3].Type))
{
- overload = MethodsToGen_Extensions_ServiceCollection.Configure_T_name_BinderOptions;
+ overload = MethodsToGen.ServiceCollectionExt_Configure_T_name_BinderOptions;
}
else
{
@@ -69,22 +69,38 @@ @params[1].Type.SpecialType is SpecialType.System_String &&
return;
}
- TypeSpec typeSpec = GetTargetTypeForRootInvocation(
- type: targetMethod.TypeArguments[0].WithNullableAnnotation(NullableAnnotation.None),
- invocation.Location);
+ ITypeSymbol? typeSymbol = targetMethod.TypeArguments[0].WithNullableAnnotation(NullableAnnotation.None);
+ // This would violate generic type constraint; any such invocation could not have been included in the initial parser.
+ Debug.Assert(typeSymbol?.IsValueType is not true);
- if (typeSpec is null)
+ EnqueueTargetTypeForRootInvocation(typeSymbol, overload, invocation);
+ }
+
+ private void RegisterInterceptor_ServiceCollectionExt(TypeParseInfo typeParseInfo, TypeSpec typeSpec)
+ {
+ MethodsToGen overload = typeParseInfo.BindingOverload;
+
+ if (typeSpec is ComplexTypeSpec complexTypeSpec &&
+ TryRegisterTypeForOverloadGen_ServiceCollectionExt(overload, complexTypeSpec))
{
- return;
+ _interceptorInfoBuilder.RegisterInterceptor(overload, typeParseInfo.BinderInvocation.Operation);
}
-
- RegisterTypeForMethodGen(overload, typeSpec);
}
- private void RegisterTypeForMethodGen(MethodsToGen_Extensions_ServiceCollection overload, TypeSpec typeSpec)
+ private bool TryRegisterTypeForOverloadGen_ServiceCollectionExt(MethodsToGen overload, ComplexTypeSpec typeSpec)
{
- _sourceGenSpec.MethodsToGen_ServiceCollectionExt |= overload;
- RegisterTypeForBindCoreUntypedGen(typeSpec);
+ Debug.Assert((MethodsToGen.ServiceCollectionExt_Any & overload) is not 0);
+
+ if (!_helperInfoBuilder!.TryRegisterTypeForBindCoreMainGen(typeSpec))
+ {
+ return false;
+ }
+
+ _interceptorInfoBuilder.MethodsToGen |= overload;
+ _helperInfoBuilder!.RegisterNamespace("Microsoft.Extensions.DependencyInjection");
+ // Emitting refs to IOptionsChangeTokenSource, ConfigurationChangeTokenSource, IConfigureOptions<>, ConfigureNamedOptions<>.
+ _helperInfoBuilder!.RegisterNamespace("Microsoft.Extensions.Options");
+ return true;
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/Strings.resx b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/Strings.resx
index 301913987d7c7e..be66da59c6b5a7 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/Strings.resx
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/Strings.resx
@@ -121,7 +121,7 @@
The collection type is not supported: '{0}'.
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
The target type for a binder call could not be determined
@@ -133,10 +133,10 @@
The collection element type is not supported: '{0}'.
- The project's language version has to be at least 'C# 11'.
+ The project's language version has to be at least 'C# 12'.
- Language version is required to be at least C# 11
+ Language version is required to be at least C# 12
Cannot create instance of type '{0}' because it is missing a public instance constructor.
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.cs.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.cs.xlf
index e248c54626865f..8af274c8cb6562 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.cs.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.cs.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- Pro volání vazače se nevygenerovala logika vazby. Nepodporované vstupní vzory zahrnují obecná volání a předávání zabalených objektů.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ Pro volání vazby se nevygenerovala logika vazby. Mezi nepodporované vstupní vzory patří obecná volání, předávání zabalených objektů a předávání typů, které nejsou public ani internal.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- Jazyková verze projektu musí být alespoň C# 11
+ The project's language version has to be at least 'C# 12'.
+ Jazyková verze projektu musí být alespoň C# 12
- Language version is required to be at least C# 11
- Verze jazyka musí být alespoň C# 11
+ Language version is required to be at least C# 12
+ Verze jazyka musí být alespoň C# 12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.de.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.de.xlf
index 1fa847592bd02e..5f98b4d4a396f0 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.de.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.de.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- Für einen Binderaufruf wurde keine Bindungslogik generiert. Nicht unterstützte Eingabemuster umfassen generische Aufrufe und übergeben geschachtelte Objekte.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ Für einen Binderaufruf wurde keine Bindungslogik generiert. Nicht unterstützte Eingabemuster umfassen generische Aufrufe, vorübergehende geschachtelte Objekte und das Übergeben von Typen, die nicht "public" oder "internal" sind.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- Die Sprachversion des Projekts muss mindestens „C# 11“ sein
+ The project's language version has to be at least 'C# 12'.
+ Die Sprachversion des Projekts muss mindestens "C# 12" sein.
- Language version is required to be at least C# 11
- Die Sprachversion muss mindestens C# 11 sein
+ Language version is required to be at least C# 12
+ Die Sprachversion muss mindestens C# 12 sein.
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.es.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.es.xlf
index c52b2317ceaded..446d2f0f7edb8f 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.es.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.es.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- No se generó la lógica de enlace para una llamada de enlazador. Los patrones de entrada no admitidos incluyen llamadas genéricas y pasar objetos en cuadros.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ No se ha generado la lógica de enlace para una llamada de enlace. Entre los patrones de entrada no admitidos se incluyen las llamadas genéricas, el paso de objetos en caja y el paso de tipos que no son "públicos" o "internos".
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- La versión del lenguaje del proyecto debe ser al menos "C# 11".
+ The project's language version has to be at least 'C# 12'.
+ La versión del lenguaje del proyecto debe ser al menos "C# 12".
- Language version is required to be at least C# 11
- La versión del lenguaje debe ser al menos C# 11
+ Language version is required to be at least C# 12
+ La versión del lenguaje debe ser al menos C# 12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.fr.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.fr.xlf
index 19362d7336208f..517d8ffad0e5cc 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.fr.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.fr.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- La logique de liaison n’a pas été générée pour un appel de classeur. Les modèles d’entrée non pris en charge incluent les appels génériques et les objets boxed de passage.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ La logique de liaison n’a pas été générée pour un appel de classeur. Les modèles d’entrée non pris en charge incluent les appels génériques, le passage d’objets box et les types de passage qui ne sont pas 'public' ou 'internal'.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- La version de langage du projet doit être au moins « C# 11 ».
+ The project's language version has to be at least 'C# 12'.
+ La version de langage du projet doit être au moins 'C# 12'.
- Language version is required to be at least C# 11
- La version du langage doit être au moins C# 11
+ Language version is required to be at least C# 12
+ La version du langage doit être au moins C# 12.
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.it.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.it.xlf
index f418a83d0d422e..787d46e9e7339f 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.it.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.it.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- La logica di binding non è stata generata per una chiamata binder. I modelli di input non supportati includono chiamate generiche e il passaggio di oggetti in caselle.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ La logica di associazione non è stata generata per una chiamata del gestore di associazione. I modelli di input non supportati includono chiamate generici, il passaggio di oggetti boxed e il passaggio di tipi non 'public' o 'internal'.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- La versione del linguaggio del progetto deve essere almeno 'C# 11'.
+ The project's language version has to be at least 'C# 12'.
+ La versione del linguaggio del progetto deve essere almeno 'C# 12'.
- Language version is required to be at least C# 11
- La versione del linguaggio deve essere almeno C# 11
+ Language version is required to be at least C# 12
+ La versione del linguaggio deve essere almeno C# 12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ja.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ja.xlf
index ba59cfba40a89b..57308cabd0da29 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ja.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ja.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- バインダー呼び出しのバインド ロジックが生成されませんでした。サポートされていない入力パターンとしては、ジェネリック呼び出し、ボックス化されたオブジェクトの受け渡しなどがあります。
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ バインダー呼び出しのバインド ロジックが生成されませんでした。サポートされていない入力パターンには、ジェネリック呼び出し、ボックス化されたオブジェクトの受け渡し、および 'public' または 'internal' ではない型の受け渡しが含まれます。
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- プロジェクトの言語バージョンは少なくとも 'C# 11' である必要があります。
+ The project's language version has to be at least 'C# 12'.
+ プロジェクトの言語バージョンは少なくとも 'C# 12' である必要があります。
- Language version is required to be at least C# 11
- 言語バージョンは少なくとも C# 11 である必要があります
+ Language version is required to be at least C# 12
+ 言語バージョンは少なくとも C# 12 である必要があります
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ko.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ko.xlf
index 10b9b107c4aade..e97e99e1ac7cd0 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ko.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ko.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- 바인더 호출에 대한 바인딩 논리가 생성되지 않았습니다. 지원되지 않는 입력 패턴에는 제네릭 호출 및 boxed 개체 전달이 포함됩니다.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ 바인더 호출에 대한 바인딩 논리가 생성되지 않았습니다. 지원되지 않는 입력 패턴에는 제네릭 호출, boxed 개체 전달 및 'public' 또는 'internal'이 아닌 전달 형식이 포함됩니다.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- 프로젝트의 언어 버전은 'C# 11' 이상이어야 합니다.
+ The project's language version has to be at least 'C# 12'.
+ 프로젝트의 언어 버전은 'C# 12' 이상이어야 합니다.
- Language version is required to be at least C# 11
- 언어 버전은 C# 11 이상이어야 합니다.
+ Language version is required to be at least C# 12
+ 언어 버전은 C# 12 이상이어야 합니다.
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pl.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pl.xlf
index 2b558c588ebfb9..d0a4985215c6aa 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pl.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pl.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- Nie wygenerowano logiki powiązania dla wywołania integratora. Nieobsługiwane wzorce wejściowe obejmują wywołania ogólne i przekazywanie obiektów w ramce.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ Logika powiązania nie została wygenerowana dla wywołania integratora. Nieobsługiwane wzorce wejściowe obejmują ogólne wywołania, przekazywanie obiektów w pudełkach i przekazywanie typów, które nie są „publiczne” lub „wewnętrzne”.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- Wersja językowa projektu musi mieć wartość co najmniej „C# 11”.
+ The project's language version has to be at least 'C# 12'.
+ Wersja językowa projektu musi mieć wartość co najmniej „C# 12”.
- Language version is required to be at least C# 11
- Wymagana jest wersja językowa co najmniej C# 11
+ Language version is required to be at least C# 12
+ Wymagana jest wersja językowa o wartości co najmniej C# 12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pt-BR.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pt-BR.xlf
index 9d2a51c6aa9c96..965a1181aacd34 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.pt-BR.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- A lógica de associação não foi gerada para uma chamada de associador. Os padrões de entrada sem suporte incluem chamadas genéricas e passagem de objetos em caixa.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ A lógica de associação não foi gerada para uma chamada de fichário. Padrões de entrada sem suporte incluem chamadas genéricas, passagem de objetos em caixa e passagem de tipos que não são 'públicos' ou 'internos'.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- A versão do idioma do projeto deve ser no mínimo 'C# 11'.
+ The project's language version has to be at least 'C# 12'.
+ A versão da linguagem do projeto deve ser no mínimo 'C# 12'.
- Language version is required to be at least C# 11
- A versão do idioma deve ser pelo menos C# 11
+ Language version is required to be at least C# 12
+ A versão do idioma deve ser pelo menos C# 12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ru.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ru.xlf
index 1ed03c55891a9e..c230a1edd07d1d 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ru.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.ru.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- Логика привязки не была создана для вызова модуля привязки. К неподдерживаемым шаблонам ввода относятся универсальные вызовы и передача упакованных объектов.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ Логика привязки не создана для вызова привязки. Неподдерживаемые шаблоны ввода включают общие вызовы, передачу упакованных объектов и передачу типов, не являющихся "общедоступными" или "внутренними".
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- Версия языка проекта должна быть не ниже "C# 11".
+ The project's language version has to be at least 'C# 12'.
+ Версия языка проекта должна быть не ниже "C# 12".
- Language version is required to be at least C# 11
- Версия языка должна быть не ниже C# 11
+ Language version is required to be at least C# 12
+ Версия языка должна быть не ниже C# 12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.tr.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.tr.xlf
index 8a6dbf76bab7f7..1ffbaa22a96a85 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.tr.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.tr.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- Bir bağlayıcı çağrısı için bağlama mantığı oluşturulmadı. Desteklenmeyen giriş desenleri genel çağrılar ve geçici kutulu nesneler içeriyor.
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ Bağlama mantığı bir bağlayıcı çağrısı için oluşturulmadı. Desteklenmeyen giriş düzenleri şunları içerir: genel çağrılar, geçirilen kutulu nesneler ve ‘genel’ veya ‘iç’ olmayan geçirme türleri.
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- Projenin dil sürümü en az 'C# 11' olmalıdır.
+ The project's language version has to be at least 'C# 12'.
+ Projenin dil sürümü en az 'C# 12' olmalıdır.
- Language version is required to be at least C# 11
- Dil sürümünün en az C# 11 olması gerekir
+ Language version is required to be at least C# 12
+ Dil sürümünün en az C# 12 olması gerekir
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hans.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hans.xlf
index 9d0c0eb3a5d6dd..dd89336534060a 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hans.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- 未为联编程序调用生成绑定逻辑。不支持的输入模式包括泛型调用和传递装箱对象。
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ 没有为绑定器调用生成绑定逻辑。不支持的输入模式包括泛型调用、传递装箱对象和传递不是“public”或“internal”的类型。
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- 项目的语言版本必须至少为 "C# 11"。
+ The project's language version has to be at least 'C# 12'.
+ 项目的语言版本必须至少为 "C# 12"。
- Language version is required to be at least C# 11
- 语言版本必须至少为 C# 11
+ Language version is required to be at least C# 12
+ 语言版本必须至少为 C# 12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hant.xlf b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hant.xlf
index dc6ded618c8e94..a30c193b7f0115 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Resources/xlf/Strings.zh-Hant.xlf
@@ -8,8 +8,8 @@
- Binding logic was not generated for a binder call. Unsupported input patterns include generic calls and passing boxed objects.
- 未產生文件夾呼叫的繫結邏輯。不支援的輸入模式包括一般呼叫和傳遞方塊物件。
+ Binding logic was not generated for a binder call. Unsupported input patterns include generic calls, passing boxed objects, and passing types that are not 'public' or 'internal'.
+ 未產生文件夾呼叫的繫結邏輯。不支援的輸入模式包括一般呼叫、傳遞方塊物件，以及非 'public' 或 'internal' 的傳遞類型。。
@@ -28,13 +28,13 @@
- The project's language version has to be at least 'C# 11'.
- 專案的語言版本必須至少為 'C# 11'。
+ The project's language version has to be at least 'C# 12'.
+ 專案的語言版本必須至少為 'C# 12'。
- Language version is required to be at least C# 11
- 語言版本要求至少為 C#11
+ Language version is required to be at least C# 12
+ 語言版本要求至少為 C#12
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/BindingHelperInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/BindingHelperInfo.cs
new file mode 100644
index 00000000000000..096c8410717ae7
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/BindingHelperInfo.cs
@@ -0,0 +1,237 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed record BindingHelperInfo
+ {
+ public required ImmutableEquatableArray Namespaces { get; init; }
+ public required bool EmitConfigurationKeyCaches { get; init; }
+
+ public required MethodsToGen_CoreBindingHelper MethodsToGen { get; init; }
+ public required ImmutableEquatableArray? TypesForGen_BindCoreMain { get; init; }
+ public required ImmutableEquatableArray? TypesForGen_GetCore { get; init; }
+ public required ImmutableEquatableArray? TypesForGen_GetValueCore { get; init; }
+ public required ImmutableEquatableArray? TypesForGen_BindCore { get; init; }
+ public required ImmutableEquatableArray? TypesForGen_Initialize { get; init; }
+ public required ImmutableEquatableArray? TypesForGen_ParsePrimitive { get; init; }
+
+ internal sealed class Builder(TypeIndex _typeIndex)
+ {
+ private readonly Dictionary _seenTransitiveTypes = new();
+
+ private MethodsToGen_CoreBindingHelper _methodsToGen;
+ private bool _emitConfigurationKeyCaches;
+
+ private readonly Dictionary> _typesForGen = new();
+
+ private readonly SortedSet _namespaces = new()
+ {
+ "System",
+ "System.CodeDom.Compiler",
+ "System.Globalization",
+ "System.Runtime.CompilerServices",
+ "Microsoft.Extensions.Configuration",
+ };
+
+ public BindingHelperInfo ToIncrementalValue()
+ {
+ return new BindingHelperInfo
+ {
+ Namespaces = _namespaces.ToImmutableEquatableArray(),
+ EmitConfigurationKeyCaches = _emitConfigurationKeyCaches,
+
+ MethodsToGen = _methodsToGen,
+ TypesForGen_GetCore = GetTypesForGen_CoreBindingHelper(MethodsToGen_CoreBindingHelper.GetCore),
+ TypesForGen_BindCoreMain = GetTypesForGen_CoreBindingHelper(MethodsToGen_CoreBindingHelper.BindCoreMain),
+ TypesForGen_GetValueCore = GetTypesForGen_CoreBindingHelper(MethodsToGen_CoreBindingHelper.GetValueCore),
+ TypesForGen_BindCore = GetTypesForGen_CoreBindingHelper(MethodsToGen_CoreBindingHelper.BindCore),
+ TypesForGen_Initialize = GetTypesForGen_CoreBindingHelper(MethodsToGen_CoreBindingHelper.Initialize),
+ TypesForGen_ParsePrimitive = GetTypesForGen_CoreBindingHelper(MethodsToGen_CoreBindingHelper.ParsePrimitive)
+ };
+
+ ImmutableEquatableArray? GetTypesForGen_CoreBindingHelper(MethodsToGen_CoreBindingHelper overload)
+ where TSpec : TypeSpec, IEquatable
+ {
+ _typesForGen.TryGetValue(overload, out HashSet? typesAsBase);
+
+ if (typesAsBase is null)
+ {
+ return null;
+ }
+
+ IEnumerable types = typeof(TSpec) == typeof(TypeSpec)
+ ? (HashSet)(object)typesAsBase
+ : typesAsBase.Select(t => (TSpec)t);
+
+ return GetTypesForGen(types);
+ }
+
+ static ImmutableEquatableArray GetTypesForGen(IEnumerable types)
+ where TSpec : TypeSpec, IEquatable =>
+ types.ToImmutableEquatableArray();
+ }
+
+ public bool TryRegisterTypeForGetGen(TypeSpec type)
+ {
+ if (TryRegisterTransitiveTypesForMethodGen(type.TypeRef))
+ {
+ RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.GetCore, type);
+ RegisterForGen_AsConfigWithChildrenHelper();
+ return true;
+ }
+
+ return false;
+ }
+
+ public bool TryRegisterTypeForGetValueGen(TypeSpec typeSpec)
+ {
+ ParsableFromStringSpec effectiveType = (ParsableFromStringSpec)_typeIndex.GetEffectiveTypeSpec(typeSpec);
+ RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.GetValueCore, typeSpec);
+ RegisterStringParsableTypeIfApplicable(effectiveType);
+ return true;
+ }
+
+ public bool TryRegisterTypeForBindCoreMainGen(ComplexTypeSpec type)
+ {
+ if (TryRegisterTransitiveTypesForMethodGen(type.TypeRef))
+ {
+ RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCoreMain, type);
+ RegisterForGen_AsConfigWithChildrenHelper();
+ return true;
+ }
+
+ return false;
+ }
+
+ public bool TryRegisterTransitiveTypesForMethodGen(TypeRef typeRef)
+ {
+ return _seenTransitiveTypes.TryGetValue(typeRef, out bool isValid)
+ ? isValid
+ : (_seenTransitiveTypes[typeRef] = TryRegisterCore());
+
+ bool TryRegisterCore()
+ {
+ switch (_typeIndex.GetTypeSpec(typeRef))
+ {
+ case NullableSpec nullableSpec:
+ {
+ return TryRegisterTransitiveTypesForMethodGen(nullableSpec.EffectiveTypeRef);
+ }
+ case ParsableFromStringSpec stringParsableSpec:
+ {
+ RegisterStringParsableTypeIfApplicable(stringParsableSpec);
+ return true;
+ }
+ case DictionarySpec dictionarySpec:
+ {
+ bool shouldRegister = _typeIndex.CanBindTo(typeRef) &&
+ TryRegisterTransitiveTypesForMethodGen(dictionarySpec.KeyTypeRef) &&
+ TryRegisterTransitiveTypesForMethodGen(dictionarySpec.ElementTypeRef) &&
+ TryRegisterTypeForBindCoreGen(dictionarySpec);
+
+ if (shouldRegister && dictionarySpec.InstantiationStrategy is CollectionInstantiationStrategy.LinqToDictionary)
+ {
+ _namespaces.Add("System.Linq");
+ }
+
+ return shouldRegister;
+ }
+ case CollectionSpec collectionSpec:
+ {
+ return TryRegisterTransitiveTypesForMethodGen(collectionSpec.ElementTypeRef) &&
+ TryRegisterTypeForBindCoreGen(collectionSpec);
+ }
+ case ObjectSpec objectSpec:
+ {
+ // Base case to avoid stack overflow for recursive object graphs.
+ // Register all object types for gen; we need to throw runtime exceptions in some cases.
+ bool shouldRegister = true;
+ _seenTransitiveTypes.Add(typeRef, shouldRegister);
+
+ // List is used in generated code as a temp holder for formatting
+ // an error for config properties that don't map to object properties.
+ _namespaces.Add("System.Collections.Generic");
+
+ if (_typeIndex.HasBindableMembers(objectSpec))
+ {
+ foreach (PropertySpec property in objectSpec.Properties!)
+ {
+ TryRegisterTransitiveTypesForMethodGen(property.TypeRef);
+
+ if (_typeIndex.GetTypeSpec(property.TypeRef) is ComplexTypeSpec)
+ {
+ RegisterForGen_AsConfigWithChildrenHelper();
+ }
+ }
+
+ bool registeredForBindCore = TryRegisterTypeForBindCoreGen(objectSpec);
+ Debug.Assert(registeredForBindCore);
+
+ if (objectSpec is { InstantiationStrategy: ObjectInstantiationStrategy.ParameterizedConstructor, InitExceptionMessage: null })
+ {
+ RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.Initialize, objectSpec);
+ }
+ }
+
+ return true;
+ }
+ default:
+ {
+ return true;
+ }
+ }
+ }
+ }
+
+ public void RegisterNamespace(string @namespace) => _namespaces.Add(@namespace);
+
+ private bool TryRegisterTypeForBindCoreGen(ComplexTypeSpec type)
+ {
+ if (_typeIndex.HasBindableMembers(type))
+ {
+ RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCore, type);
+ _emitConfigurationKeyCaches = true;
+ return true;
+ }
+
+ return false;
+ }
+
+ private void RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper method, TypeSpec type)
+ {
+ if (!_typesForGen.TryGetValue(method, out HashSet? types))
+ {
+ _typesForGen[method] = types = new HashSet();
+ }
+
+ if (types.Add(type))
+ {
+ _methodsToGen |= method;
+
+ if (type is { Namespace: string @namespace })
+ {
+ _namespaces.Add(@namespace);
+ }
+ }
+ }
+
+ private void RegisterStringParsableTypeIfApplicable(ParsableFromStringSpec type)
+ {
+ if (type.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue)
+ {
+ _methodsToGen |= MethodsToGen_CoreBindingHelper.ParsePrimitive;
+ RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.ParsePrimitive, type);
+ }
+ }
+
+ private void RegisterForGen_AsConfigWithChildrenHelper() => _methodsToGen |= MethodsToGen_CoreBindingHelper.AsConfigWithChildren;
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/InterceptorInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/InterceptorInfo.cs
new file mode 100644
index 00000000000000..999ed6514f99d7
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/InterceptorInfo.cs
@@ -0,0 +1,202 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Operations;
+using Microsoft.CodeAnalysis.Text;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed record InterceptorInfo
+ {
+ public required MethodsToGen MethodsToGen { get; init; }
+
+ public required ImmutableEquatableArray? ConfigBinder_Bind_instance { get; init; }
+ public required ImmutableEquatableArray? ConfigBinder_Bind_instance_BinderOptions { get; init; }
+ public required ImmutableEquatableArray? ConfigBinder_Bind_key_instance { get; init; }
+
+
+ public required ImmutableEquatableArray? ConfigBinder { get; init; }
+ public required ImmutableEquatableArray? OptionsBuilderExt { get; init; }
+ public required ImmutableEquatableArray? ServiceCollectionExt { get; init; }
+
+ public IEnumerable? GetInfo(MethodsToGen interceptor)
+ {
+ Debug.Assert((MethodsToGen.ConfigBinder_Bind & interceptor) is 0);
+
+ ImmutableEquatableArray? infoList;
+ if ((MethodsToGen.ConfigBinder_Any ^ MethodsToGen.ConfigBinder_Bind & interceptor) is not 0)
+ {
+ infoList = ConfigBinder;
+ }
+ else if ((MethodsToGen.OptionsBuilderExt_Any & interceptor) is not 0)
+ {
+ infoList = OptionsBuilderExt;
+ }
+ else
+ {
+ Debug.Assert((MethodsToGen.ServiceCollectionExt_Any & interceptor) is not 0);
+ infoList = ServiceCollectionExt;
+ }
+
+ return infoList?.Where(i => i.Interceptor == interceptor);
+ }
+
+ internal sealed class Builder
+ {
+ private TypedInterceptorInfoBuildler? _configBinder_InfoBuilder_Bind_instance;
+ private TypedInterceptorInfoBuildler? _configBinder_InfoBuilder_Bind_instance_BinderOptions;
+ private TypedInterceptorInfoBuildler? _configBinder_InfoBuilder_Bind_key_instance;
+
+ private List? _interceptors_configBinder;
+ private List? _interceptors_OptionsBuilderExt;
+ private List? _interceptors_serviceCollectionExt;
+
+ public MethodsToGen MethodsToGen { get; set; }
+
+ public void RegisterInterceptor_ConfigBinder_Bind(MethodsToGen overload, ComplexTypeSpec type, IInvocationOperation invocation)
+ {
+ Debug.Assert((MethodsToGen.ConfigBinder_Bind & overload) is not 0);
+
+ switch (overload)
+ {
+ case MethodsToGen.ConfigBinder_Bind_instance:
+ RegisterInterceptor(ref _configBinder_InfoBuilder_Bind_instance);
+ break;
+ case MethodsToGen.ConfigBinder_Bind_instance_BinderOptions:
+ RegisterInterceptor(ref _configBinder_InfoBuilder_Bind_instance_BinderOptions);
+ break;
+ case MethodsToGen.ConfigBinder_Bind_key_instance:
+ RegisterInterceptor(ref _configBinder_InfoBuilder_Bind_key_instance);
+ break;
+ }
+
+ MethodsToGen |= overload;
+
+ void RegisterInterceptor(ref TypedInterceptorInfoBuildler? infoBuilder)
+ {
+ infoBuilder ??= new TypedInterceptorInfoBuildler();
+ infoBuilder.RegisterInterceptor(overload, type, invocation);
+ }
+ }
+
+ public void RegisterInterceptor(MethodsToGen overload, IInvocationOperation operation)
+ {
+ Debug.Assert((MethodsToGen.ConfigBinder_Bind & overload) is 0);
+
+ if ((MethodsToGen.ConfigBinder_Any ^ MethodsToGen.ConfigBinder_Bind & overload) is not 0)
+ {
+ RegisterInterceptor(ref _interceptors_configBinder);
+ }
+ else if ((MethodsToGen.OptionsBuilderExt_Any & overload) is not 0)
+ {
+ RegisterInterceptor(ref _interceptors_OptionsBuilderExt);
+ }
+ else
+ {
+ Debug.Assert((MethodsToGen.ServiceCollectionExt_Any & overload) is not 0);
+ RegisterInterceptor(ref _interceptors_serviceCollectionExt);
+ }
+
+ MethodsToGen |= overload;
+
+ void RegisterInterceptor(ref List? infoList)
+ {
+ infoList ??= new List();
+ infoList.Add(new InvocationLocationInfo(overload, operation));
+ }
+ }
+
+ public InterceptorInfo ToIncrementalValue() =>
+ new InterceptorInfo
+ {
+ MethodsToGen = MethodsToGen,
+
+ ConfigBinder = _interceptors_configBinder?.ToImmutableEquatableArray(),
+ OptionsBuilderExt = _interceptors_OptionsBuilderExt?.ToImmutableEquatableArray(),
+ ServiceCollectionExt = _interceptors_serviceCollectionExt?.ToImmutableEquatableArray(),
+
+ ConfigBinder_Bind_instance = _configBinder_InfoBuilder_Bind_instance?.ToIncrementalValue(),
+ ConfigBinder_Bind_instance_BinderOptions = _configBinder_InfoBuilder_Bind_instance_BinderOptions?.ToIncrementalValue(),
+ ConfigBinder_Bind_key_instance = _configBinder_InfoBuilder_Bind_key_instance?.ToIncrementalValue(),
+ };
+ }
+ }
+
+ internal sealed class TypedInterceptorInfoBuildler
+ {
+ private readonly Dictionary _invocationInfoBuilderCache = new();
+
+ public void RegisterInterceptor(MethodsToGen overload, ComplexTypeSpec type, IInvocationOperation invocation)
+ {
+ if (!_invocationInfoBuilderCache.TryGetValue(type, out TypedInterceptorInvocationInfo.Builder? invocationInfoBuilder))
+ {
+ _invocationInfoBuilderCache[type] = invocationInfoBuilder = new TypedInterceptorInvocationInfo.Builder(overload, type);
+ }
+
+ invocationInfoBuilder.RegisterInvocation(invocation);
+ }
+
+ public ImmutableEquatableArray? ToIncrementalValue() =>
+ _invocationInfoBuilderCache.Values
+ .Select(b => b.ToIncrementalValue())
+ .ToImmutableEquatableArray();
+ }
+
+ public sealed record TypedInterceptorInvocationInfo(ComplexTypeSpec TargetType, ImmutableEquatableArray Locations)
+ {
+ public sealed class Builder(MethodsToGen Overload, ComplexTypeSpec TargetType)
+ {
+ private readonly List _infoList = new();
+
+ public void RegisterInvocation(IInvocationOperation invocation) =>
+ _infoList.Add(new InvocationLocationInfo(Overload, invocation));
+
+ public TypedInterceptorInvocationInfo ToIncrementalValue() => new(
+ TargetType,
+ Locations: _infoList.ToImmutableEquatableArray());
+ }
+ }
+
+ public sealed record InvocationLocationInfo
+ {
+ public InvocationLocationInfo(MethodsToGen interceptor, IInvocationOperation invocation)
+ {
+ Debug.Assert(BinderInvocation.IsBindingOperation(invocation));
+
+ if (invocation.Syntax is not InvocationExpressionSyntax { Expression: MemberAccessExpressionSyntax memberAccessExprSyntax })
+ {
+ const string InvalidInvocationErrMsg = "The invocation should have been validated upstream when selecting invocations to emit interceptors for.";
+ throw new ArgumentException(InvalidInvocationErrMsg, nameof(invocation));
+ }
+
+ SyntaxTree operationSyntaxTree = invocation.Syntax.SyntaxTree;
+ TextSpan memberNameSpan = memberAccessExprSyntax.Name.Span;
+ FileLinePositionSpan linePosSpan = operationSyntaxTree.GetLineSpan(memberNameSpan);
+
+ Interceptor = interceptor;
+ LineNumber = linePosSpan.StartLinePosition.Line + 1;
+ CharacterNumber = linePosSpan.StartLinePosition.Character + 1;
+ FilePath = GetInterceptorFilePath();
+
+ // Use the same logic used by the interceptors API for resolving the source mapped value of a path.
+ // https://github.com/dotnet/roslyn/blob/f290437fcc75dad50a38c09e0977cce13a64f5ba/src/Compilers/CSharp/Portable/Compilation/CSharpCompilation.cs#L1063-L1064
+ string GetInterceptorFilePath()
+ {
+ SourceReferenceResolver? sourceReferenceResolver = invocation.SemanticModel?.Compilation.Options.SourceReferenceResolver;
+ return sourceReferenceResolver?.NormalizePath(operationSyntaxTree.FilePath, baseFilePath: null) ?? operationSyntaxTree.FilePath;
+ }
+ }
+
+ public MethodsToGen Interceptor { get; }
+ public string FilePath { get; }
+ public int LineNumber { get; }
+ public int CharacterNumber { get; }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/MemberSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/MemberSpec.cs
similarity index 82%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/MemberSpec.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/MemberSpec.cs
index 4bf674f597502a..dc5b03087ac87a 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/MemberSpec.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/MemberSpec.cs
@@ -3,10 +3,11 @@
using System.Diagnostics;
using Microsoft.CodeAnalysis;
+using SourceGenerators;
namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
- internal abstract record MemberSpec
+ public abstract record MemberSpec
{
public MemberSpec(ISymbol member)
{
@@ -16,10 +17,9 @@ public MemberSpec(ISymbol member)
}
public string Name { get; }
- public bool ErrorOnFailedBinding { get; protected set; }
public string DefaultValueExpr { get; protected set; }
- public required TypeSpec Type { get; init; }
+ public required TypeRef TypeRef { get; init; }
public required string ConfigurationKeyName { get; init; }
public abstract bool CanGet { get; }
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ParameterSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/ParameterSpec.cs
similarity index 82%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ParameterSpec.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/ParameterSpec.cs
index 9b5e4360c11169..62c781e1f1631f 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/ParameterSpec.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/ParameterSpec.cs
@@ -6,7 +6,7 @@
namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
- internal sealed record ParameterSpec : MemberSpec
+ public sealed record ParameterSpec : MemberSpec
{
public ParameterSpec(IParameterSymbol parameter) : base(parameter)
{
@@ -14,7 +14,7 @@ public ParameterSpec(IParameterSymbol parameter) : base(parameter)
if (parameter.HasExplicitDefaultValue)
{
- string formatted = SymbolDisplay.FormatPrimitive(parameter.ExplicitDefaultValue, quoteStrings: true, useHexadecimalNumbers: false);
+ string formatted = SymbolDisplay.FormatPrimitive(parameter.ExplicitDefaultValue!, quoteStrings: true, useHexadecimalNumbers: false);
if (formatted is not "null")
{
DefaultValueExpr = formatted;
@@ -26,6 +26,8 @@ public ParameterSpec(IParameterSymbol parameter) : base(parameter)
}
}
+ public bool ErrorOnFailedBinding { get; private set; }
+
public RefKind RefKind { get; }
public override bool CanGet => false;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/PropertySpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/PropertySpec.cs
similarity index 90%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/PropertySpec.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/PropertySpec.cs
index 584e8d570b8a9f..443e39d32e4933 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Model/PropertySpec.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Members/PropertySpec.cs
@@ -5,7 +5,7 @@
namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
- internal sealed record PropertySpec : MemberSpec
+ public sealed record PropertySpec : MemberSpec
{
public PropertySpec(IPropertySymbol property) : base(property)
{
@@ -28,7 +28,5 @@ public PropertySpec(IPropertySymbol property) : base(property)
public override bool CanGet { get; }
public override bool CanSet { get; }
-
- public bool ShouldBind() => CanGet || CanSet;
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/MethodsToGen.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/MethodsToGen.cs
new file mode 100644
index 00000000000000..af2a33fa6c2f80
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/MethodsToGen.cs
@@ -0,0 +1,145 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ [Flags]
+ public enum MethodsToGen_CoreBindingHelper
+ {
+ None = 0x0,
+ BindCore = 0x1,
+ GetCore = 0x2,
+ GetValueCore = 0x4,
+ BindCoreMain = 0x8,
+ Initialize = 0x10,
+ HasValueOrChildren = 0x20,
+ AsConfigWithChildren = 0x40,
+ ParsePrimitive = 0x80,
+ }
+
+ ///
+ /// Methods on Microsoft.Extensions.Configuration.ConfigurationBinder
+ ///
+ [Flags]
+ public enum MethodsToGen
+ {
+ None = 0x0,
+ Any = ConfigBinder_Any | OptionsBuilderExt_Any | ServiceCollectionExt_Any,
+
+ #region IConfiguration ext. method overloads: 0x1 - 0x400
+ ///
+ /// Bind(IConfiguration, object?).
+ ///
+ ConfigBinder_Bind_instance = 0x1,
+
+ ///
+ /// Bind(IConfiguration, object?, Action?).
+ ///
+ ConfigBinder_Bind_instance_BinderOptions = 0x2,
+
+ ///
+ /// Bind(IConfiguration, string, object?).
+ ///
+ ConfigBinder_Bind_key_instance = 0x4,
+
+ ///
+ /// Get(IConfiguration).
+ ///
+ ConfigBinder_Get_T = 0x8,
+
+ ///
+ /// Get(IConfiguration, Action?).
+ ///
+ ConfigBinder_Get_T_BinderOptions = 0x10,
+
+ ///
+ /// Get(IConfiguration, Type).
+ ///
+ ConfigBinder_Get_TypeOf = 0x20,
+
+ ///
+ /// Get(IConfiguration, Type, Action?).
+ ///
+ ConfigBinder_Get_TypeOf_BinderOptions = 0x40,
+
+ ///
+ /// GetValue(IConfiguration, Type, string).
+ ///
+ ConfigBinder_GetValue_TypeOf_key = 0x80,
+
+ ///
+ /// GetValue(IConfiguration, Type, object?).
+ ///
+ ConfigBinder_GetValue_TypeOf_key_defaultValue = 0x100,
+
+ ///
+ /// GetValue(IConfiguration, string).
+ ///
+ ConfigBinder_GetValue_T_key = 0x200,
+
+ ///
+ /// GetValue(IConfiguration, string, T).
+ ///
+ ConfigBinder_GetValue_T_key_defaultValue = 0x400,
+
+ // Method groups
+ ConfigBinder_Bind = ConfigBinder_Bind_instance | ConfigBinder_Bind_instance_BinderOptions | ConfigBinder_Bind_key_instance,
+ ConfigBinder_Get = ConfigBinder_Get_T | ConfigBinder_Get_T_BinderOptions | ConfigBinder_Get_TypeOf | ConfigBinder_Get_TypeOf_BinderOptions,
+ ConfigBinder_GetValue = ConfigBinder_GetValue_T_key | ConfigBinder_GetValue_T_key_defaultValue | ConfigBinder_GetValue_TypeOf_key | ConfigBinder_GetValue_TypeOf_key_defaultValue,
+
+ ConfigBinder_Any = ConfigBinder_Bind | ConfigBinder_Get | ConfigBinder_GetValue,
+ #endregion ConfigurationBinder ext. method overloads.
+
+ #region OptionsBuilder ext. method overloads: 0x800 - 0x2000
+ ///
+ /// Bind(OptionsBuilder, IConfiguration).
+ ///
+ OptionsBuilderExt_Bind_T = 0x800,
+
+ ///
+ /// Bind(OptionsBuilder, IConfiguration, Action?).
+ ///
+ OptionsBuilderExt_Bind_T_BinderOptions = 0x1000,
+
+ ///
+ /// BindConfiguration(OptionsBuilder, string, Action?).
+ ///
+ OptionsBuilderExt_BindConfiguration_T_path_BinderOptions = 0x2000,
+
+ // Method group. BindConfiguration_T is its own method group.
+ OptionsBuilderExt_Bind = OptionsBuilderExt_Bind_T | OptionsBuilderExt_Bind_T_BinderOptions,
+
+ OptionsBuilderExt_BindConfiguration = OptionsBuilderExt_BindConfiguration_T_path_BinderOptions,
+
+ OptionsBuilderExt_Any = OptionsBuilderExt_Bind | OptionsBuilderExt_BindConfiguration,
+ #endregion OptionsBuilder ext. method overloads.
+
+ #region IServiceCollection ext. method overloads: 0x4000 - 0x20000
+ ///
+ /// Configure(IServiceCollection, IConfiguration).
+ ///
+ ServiceCollectionExt_Configure_T = 0x4000,
+
+ ///
+ /// Configure(IServiceCollection, string, IConfiguration).
+ ///
+ ServiceCollectionExt_Configure_T_name = 0x8000,
+
+ ///
+ /// Configure(IServiceCollection, IConfiguration, Action?).
+ ///
+ ServiceCollectionExt_Configure_T_BinderOptions = 0x10000,
+
+ ///
+ /// Configure(IServiceCollection, string, IConfiguration, Action?).
+ ///
+ ServiceCollectionExt_Configure_T_name_BinderOptions = 0x20000,
+
+ ServiceCollectionExt_Configure = ServiceCollectionExt_Configure_T | ServiceCollectionExt_Configure_T_name | ServiceCollectionExt_Configure_T_BinderOptions | ServiceCollectionExt_Configure_T_name_BinderOptions,
+
+ ServiceCollectionExt_Any = ServiceCollectionExt_Configure,
+ #endregion IServiceCollection ext. method overloads: 0x4000 - 0x20000
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/SourceGenerationSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/SourceGenerationSpec.cs
new file mode 100644
index 00000000000000..4f57316429e2b1
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/SourceGenerationSpec.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed record SourceGenerationSpec
+ {
+ public required InterceptorInfo InterceptorInfo { get; init; }
+ public required BindingHelperInfo BindingHelperInfo { get; init; }
+ public required ImmutableEquatableArray ConfigTypes { get; init; }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/TypeIndex.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/TypeIndex.cs
new file mode 100644
index 00000000000000..5b59577b392921
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/TypeIndex.cs
@@ -0,0 +1,122 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ internal sealed class TypeIndex(IEnumerable typeSpecs)
+ {
+ private readonly Dictionary _index = typeSpecs.ToDictionary(spec => spec.TypeRef);
+
+ public bool CanBindTo(TypeRef typeRef) => GetEffectiveTypeSpec(typeRef) switch
+ {
+ SimpleTypeSpec => true,
+ ComplexTypeSpec complexTypeSpec => CanInstantiate(complexTypeSpec) || HasBindableMembers(complexTypeSpec),
+ _ => throw new InvalidOperationException(),
+ };
+
+ public bool CanInstantiate(ComplexTypeSpec typeSpec) => typeSpec switch
+ {
+ ObjectSpec objectSpec => objectSpec is { InstantiationStrategy: not ObjectInstantiationStrategy.None, InitExceptionMessage: null },
+ DictionarySpec dictionarySpec => KeyIsSupported(dictionarySpec),
+ CollectionSpec collectionSpec => CanBindTo(collectionSpec.ElementTypeRef),
+ _ => throw new InvalidOperationException(),
+ };
+
+ public bool HasBindableMembers(ComplexTypeSpec typeSpec) =>
+ typeSpec switch
+ {
+ ObjectSpec objectSpec => objectSpec.Properties?.Any(ShouldBindTo) is true,
+ DictionarySpec dictSpec => KeyIsSupported(dictSpec) && CanBindTo(dictSpec.ElementTypeRef),
+ CollectionSpec collectionSpec => CanBindTo(collectionSpec.ElementTypeRef),
+ _ => throw new InvalidOperationException(),
+ };
+
+ public bool ShouldBindTo(PropertySpec property)
+ {
+ TypeSpec propTypeSpec = GetEffectiveTypeSpec(property.TypeRef);
+ return IsAccessible() && !IsCollectionAndCannotOverride() && !IsDictWithUnsupportedKey();
+
+ bool IsAccessible() => property.CanGet || property.CanSet;
+
+ bool IsDictWithUnsupportedKey() => propTypeSpec is DictionarySpec dictionarySpec && !KeyIsSupported(dictionarySpec);
+
+ bool IsCollectionAndCannotOverride() => !property.CanSet &&
+ propTypeSpec is CollectionWithCtorInitSpec
+ {
+ InstantiationStrategy: CollectionInstantiationStrategy.CopyConstructor or CollectionInstantiationStrategy.LinqToDictionary
+ };
+ }
+
+ public TypeSpec GetEffectiveTypeSpec(TypeRef typeRef)
+ {
+ TypeSpec typeSpec = GetTypeSpec(typeRef);
+ return GetEffectiveTypeSpec(typeSpec);
+ }
+
+ public TypeSpec GetEffectiveTypeSpec(TypeSpec typeSpec)
+ {
+ TypeRef effectiveRef = typeSpec.EffectiveTypeRef;
+ TypeSpec effectiveSpec = effectiveRef == typeSpec.TypeRef ? typeSpec : _index[effectiveRef];
+ return effectiveSpec;
+ }
+
+ public TypeSpec GetTypeSpec(TypeRef typeRef) => _index[typeRef];
+
+ public string GetInstantiationTypeDisplayString(CollectionWithCtorInitSpec type)
+ {
+ CollectionInstantiationConcreteType concreteType = type.InstantiationConcreteType;
+ return concreteType is CollectionInstantiationConcreteType.Self
+ ? type.DisplayString
+ : GetGenericTypeDisplayString(type, concreteType);
+ }
+
+ public string GetPopulationCastTypeDisplayString(CollectionWithCtorInitSpec type)
+ {
+ CollectionPopulationCastType castType = type.PopulationCastType;
+ Debug.Assert(castType is not CollectionPopulationCastType.NotApplicable);
+ return GetGenericTypeDisplayString(type, castType);
+ }
+
+ public string GetGenericTypeDisplayString(CollectionWithCtorInitSpec type, Enum genericProxyTypeName)
+ {
+ string proxyTypeNameStr = genericProxyTypeName.ToString();
+ string elementTypeDisplayString = GetTypeSpec(type.ElementTypeRef).DisplayString;
+
+ if (type is EnumerableSpec)
+ {
+ return $"{proxyTypeNameStr}<{elementTypeDisplayString}>";
+ }
+
+ string keyTypeDisplayString = GetTypeSpec(((DictionarySpec)type).KeyTypeRef).DisplayString;
+ return $"{proxyTypeNameStr}<{keyTypeDisplayString}, {elementTypeDisplayString}>";
+ }
+
+ public bool KeyIsSupported(DictionarySpec typeSpec) =>
+ // Only types that are parsable from string are supported.
+ // Nullable keys not allowed; that would cause us to emit
+ // code that violates dictionary key notnull constraint.
+ GetTypeSpec(typeSpec.KeyTypeRef) is ParsableFromStringSpec;
+
+ public static string GetConfigKeyCacheFieldName(ObjectSpec type) => $"s_configKeys_{type.IdentifierCompatibleSubstring}";
+
+ public static string GetParseMethodName(ParsableFromStringSpec type)
+ {
+ Debug.Assert(type.StringParsableTypeKind is not StringParsableTypeKind.AssignFromSectionValue);
+
+ string displayString = type.DisplayString;
+
+ string parseMethod = type.StringParsableTypeKind is StringParsableTypeKind.ByteArray
+ ? "ParseByteArray"
+ // MinimalDisplayString.Length is certainly > 2.
+ : $"Parse{(char.ToUpper(displayString[0]) + displayString.Substring(1)).Replace(".", "")}";
+
+ return parseMethod;
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/CollectionSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/CollectionSpec.cs
new file mode 100644
index 00000000000000..f891328f77af7c
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/CollectionSpec.cs
@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ internal abstract record CollectionSpec : ComplexTypeSpec
+ {
+ protected CollectionSpec(ITypeSymbol type) : base(type) { }
+
+ public required TypeRef ElementTypeRef { get; init; }
+
+ }
+
+ internal abstract record CollectionWithCtorInitSpec : CollectionSpec
+ {
+ protected CollectionWithCtorInitSpec(ITypeSymbol type) : base(type) { }
+
+ public required CollectionInstantiationStrategy InstantiationStrategy { get; init; }
+
+ public required CollectionInstantiationConcreteType InstantiationConcreteType { get; init; }
+
+ public required CollectionPopulationCastType PopulationCastType { get; init; }
+ }
+
+ internal sealed record ArraySpec : CollectionSpec
+ {
+ public ArraySpec(ITypeSymbol type) : base(type) { }
+ }
+
+ internal sealed record EnumerableSpec : CollectionWithCtorInitSpec
+ {
+ public EnumerableSpec(ITypeSymbol type) : base(type) { }
+ }
+
+ internal sealed record DictionarySpec : CollectionWithCtorInitSpec
+ {
+ public DictionarySpec(INamedTypeSymbol type) : base(type) { }
+
+ public required TypeRef KeyTypeRef { get; init; }
+ }
+
+ internal enum CollectionInstantiationStrategy
+ {
+ NotApplicable = 0,
+ ParameterlessConstructor = 1,
+ CopyConstructor = 2,
+ LinqToDictionary = 3,
+ }
+
+ internal enum CollectionInstantiationConcreteType
+ {
+ Self = 0,
+ Dictionary = 1,
+ List = 2,
+ HashSet = 3,
+ }
+
+ internal enum CollectionPopulationCastType
+ {
+ NotApplicable = 0,
+ IDictionary = 1,
+ ICollection = 2,
+ ISet = 3,
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/ObjectSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/ObjectSpec.cs
new file mode 100644
index 00000000000000..abc01258d4190c
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/ObjectSpec.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public sealed record ObjectSpec : ComplexTypeSpec
+ {
+ public ObjectSpec(
+ INamedTypeSymbol type,
+ ObjectInstantiationStrategy instantiationStrategy,
+ ImmutableEquatableArray? properties,
+ ImmutableEquatableArray? constructorParameters,
+ string? initExceptionMessage) : base(type)
+ {
+ InstantiationStrategy = instantiationStrategy;
+ Properties = properties;
+ ConstructorParameters = constructorParameters;
+ InitExceptionMessage = initExceptionMessage;
+ }
+
+ public ObjectInstantiationStrategy InstantiationStrategy { get; }
+
+ public ImmutableEquatableArray? Properties { get; }
+
+ public ImmutableEquatableArray? ConstructorParameters { get; }
+
+ public string? InitExceptionMessage { get; }
+ }
+
+ public enum ObjectInstantiationStrategy
+ {
+ None = 0,
+ ParameterlessConstructor = 1,
+ ParameterizedConstructor = 2,
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/SimpleTypeSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/SimpleTypeSpec.cs
new file mode 100644
index 00000000000000..70c7a8042e0359
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/SimpleTypeSpec.cs
@@ -0,0 +1,42 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ public abstract record SimpleTypeSpec : TypeSpec
+ {
+ public SimpleTypeSpec(ITypeSymbol type) : base(type) { }
+ }
+
+ internal sealed record ConfigurationSectionSpec : SimpleTypeSpec
+ {
+ public ConfigurationSectionSpec(ITypeSymbol type) : base(type) { }
+ }
+
+ public sealed record ParsableFromStringSpec : SimpleTypeSpec
+ {
+ public ParsableFromStringSpec(ITypeSymbol type) : base(type) { }
+
+ public required StringParsableTypeKind StringParsableTypeKind { get; init; }
+ }
+
+ public enum StringParsableTypeKind
+ {
+ None = 0,
+
+ ///
+ /// Declared types that can be assigned directly from IConfigurationSection.Value, i.e. string and typeof(object).
+ ///
+ AssignFromSectionValue = 1,
+ Enum = 2,
+ ByteArray = 3,
+ Integer = 4,
+ Float = 5,
+ Parse = 6,
+ ParseInvariant = 7,
+ CultureInfo = 8,
+ Uri = 9,
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/TypeSpec.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/TypeSpec.cs
new file mode 100644
index 00000000000000..1c243ae1cdc7c1
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/Types/TypeSpec.cs
@@ -0,0 +1,66 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using Microsoft.CodeAnalysis;
+using SourceGenerators;
+
+namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
+{
+ [DebuggerDisplay("Name={DisplayString}, Kind={SpecKind}")]
+ public abstract record TypeSpec
+ {
+ public TypeSpec(ITypeSymbol type)
+ {
+ TypeRef = new TypeRef(type);
+ EffectiveTypeRef = TypeRef; // Overriden by NullableSpec.
+ (Namespace, DisplayString, Name) = type.GetTypeName();
+ IdentifierCompatibleSubstring = type.ToIdentifierCompatibleSubstring();
+ IsValueType = type.IsValueType;
+ }
+
+ public TypeRef TypeRef { get; }
+
+ public TypeRef EffectiveTypeRef { get; protected init; }
+
+ public string Name { get; }
+
+ public string DisplayString { get; }
+
+ public string IdentifierCompatibleSubstring { get; }
+
+ public string? Namespace { get; }
+
+ public bool IsValueType { get; }
+ }
+
+ public abstract record ComplexTypeSpec : TypeSpec
+ {
+ protected ComplexTypeSpec(ITypeSymbol type) : base(type) { }
+ }
+
+ internal sealed record NullableSpec : TypeSpec
+ {
+ public NullableSpec(ITypeSymbol type, TypeRef underlyingTypeRef) : base(type) =>
+ EffectiveTypeRef = underlyingTypeRef;
+ }
+
+ internal sealed record UnsupportedTypeSpec : TypeSpec
+ {
+ public UnsupportedTypeSpec(ITypeSymbol type) : base(type) { }
+
+ public required NotSupportedReason NotSupportedReason { get; init; }
+ }
+
+ public enum NotSupportedReason
+ {
+ UnknownType = 1,
+ MissingPublicInstanceConstructor = 2,
+ CollectionNotSupported = 3,
+ DictionaryKeyNotSupported = 4,
+ ElementTypeNotSupported = 5,
+ MultipleParameterizedConstructors = 6,
+ MultiDimArraysNotSupported = 7,
+ NullableUnderlyingTypeNotSupported = 8,
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs
index 8651e4922e0d72..dfc35d80208553 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs
@@ -91,6 +91,7 @@ public static class ConfigurationBinder
Action? configureOptions)
{
ThrowHelper.ThrowIfNull(configuration);
+ ThrowHelper.ThrowIfNull(type);
var options = new BinderOptions();
configureOptions?.Invoke(options);
@@ -108,7 +109,10 @@ public static class ConfigurationBinder
[RequiresDynamicCode(DynamicCodeWarningMessage)]
[RequiresUnreferencedCode(InstanceGetTypeTrimmingWarningMessage)]
public static void Bind(this IConfiguration configuration, string key, object? instance)
- => configuration.GetSection(key).Bind(instance);
+ {
+ ThrowHelper.ThrowIfNull(configuration);
+ configuration.GetSection(key).Bind(instance);
+ }
///
/// Attempts to bind the given object instance to configuration values by matching property names against configuration keys recursively.
@@ -200,6 +204,9 @@ public static void Bind(this IConfiguration configuration, object? instance, Act
Type type, string key,
object? defaultValue)
{
+ ThrowHelper.ThrowIfNull(configuration);
+ ThrowHelper.ThrowIfNull(type);
+
IConfigurationSection section = configuration.GetSection(key);
string? value = section.Value;
if (value != null)
@@ -291,6 +298,11 @@ private static void BindInstance(
return;
}
+ if (config is null)
+ {
+ return;
+ }
+
var section = config as IConfigurationSection;
string? configValue = section?.Value;
if (configValue != null && TryConvertValue(type, configValue, section?.Path, out object? convertedValue, out Exception? error))
@@ -305,123 +317,120 @@ private static void BindInstance(
return;
}
- if (config != null)
+ if (config.GetChildren().Any())
{
- if (config.GetChildren().Any())
+ // for arrays and read-only list-like interfaces, we concatenate on to what is already there, if we can
+ if (type.IsArray || IsImmutableArrayCompatibleInterface(type))
{
- // for arrays and read-only list-like interfaces, we concatenate on to what is already there, if we can
- if (type.IsArray || IsImmutableArrayCompatibleInterface(type))
+ if (!bindingPoint.IsReadOnly)
{
- if (!bindingPoint.IsReadOnly)
- {
- bindingPoint.SetValue(BindArray(type, (IEnumerable?)bindingPoint.Value, config, options));
- }
-
- // for getter-only collection properties that we can't add to, nothing more we can do
- return;
+ bindingPoint.SetValue(BindArray(type, (IEnumerable?)bindingPoint.Value, config, options));
}
- // -----------------------------------------------------------------------------------------------------------------------------
- // | bindingPoint | bindingPoint |
- // Interface | Value | IsReadOnly | Behavior
- // -----------------------------------------------------------------------------------------------------------------------------
- // ISet | not null | true/false | Use the Value instance to populate the configuration
- // ISet | null | false | Create HashSet instance to populate the configuration
- // ISet | null | true | nothing
- // IReadOnlySet | null/not null | false | Create HashSet instance, copy over existing values, and populate the configuration
- // IReadOnlySet | null/not null | true | nothing
- // -----------------------------------------------------------------------------------------------------------------------------
- if (TypeIsASetInterface(type))
- {
- if (!bindingPoint.IsReadOnly || bindingPoint.Value is not null)
- {
- object? newValue = BindSet(type, (IEnumerable?)bindingPoint.Value, config, options);
- if (!bindingPoint.IsReadOnly && newValue != null)
- {
- bindingPoint.SetValue(newValue);
- }
- }
-
- return;
- }
+ // for getter-only collection properties that we can't add to, nothing more we can do
+ return;
+ }
- // -----------------------------------------------------------------------------------------------------------------------------
- // | bindingPoint | bindingPoint |
- // Interface | Value | IsReadOnly | Behavior
- // -----------------------------------------------------------------------------------------------------------------------------
- // IDictionary | not null | true/false | Use the Value instance to populate the configuration
- // IDictionary | null | false | Create Dictionary instance to populate the configuration
- // IDictionary | null | true | nothing
- // IReadOnlyDictionary | null/not null | false | Create Dictionary instance, copy over existing values, and populate the configuration
- // IReadOnlyDictionary