Merge branch 'main' into searchvalues-uniqueLowNibble2

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "9.0.0-prerelease.24405.1",
+      "version": "9.0.0-prerelease.24452.1",
       "commands": [
         "xharness"
       ]

.github/workflows/jit-format.yml

@@ -15,7 +15,7 @@ jobs:
         os:
           - name: linux
             image: ubuntu-latest
-            container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-net9.0
+            container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64
             extension: '.sh'
             cross: '--cross'
             rootfs: '/crossrootfs/x64'

THIRD-PARTY-NOTICES.TXT

@@ -69,19 +69,27 @@ written authorization of the copyright holder.
 License notice for zlib-ng
 -----------------------
 
-https://github.com/zlib-ng/zlib-ng/blob/develop/LICENSE.md
+https://github.com/zlib-ng/zlib-ng/blob/d54e3769be0c522015b784eca2af258b1c026107/LICENSE.md
 
 (C) 1995-2024 Jean-loup Gailly and Mark Adler
 
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
 
-Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
 
-This notice may not be removed or altered from any source distribution.
+3. This notice may not be removed or altered from any source distribution.
 
 License notice for LinuxTracepoints
 -----------------------------------

docs/design/datacontracts/RuntimeTypeSystem.md

@@ -333,6 +333,7 @@ The contract additionally depends on these data descriptors
 | `FnPtrTypeDesc` | `NumArgs` | Number of arguments to the function described by the `TypeDesc` |
 | `FnPtrTypeDesc` | `CallConv` | Lower 8 bits is the calling convention bit as extracted by the signature that defines this `TypeDesc` |
 | `FnPtrTypeDesc` | `RetAndArgTypes` | Pointer to an array of TypeHandle addresses. This length of this is 1 more than `NumArgs` |
+| `GenericsDictInfo` | `NumDicts` | Number of instantiation dictionaries, including inherited ones, in this `GenericsDictInfo` |
 | `GenericsDictInfo` | `NumTypeArgs` | Number of type arguments in the type or method instantiation described by this `GenericsDictInfo` |
 
 

docs/tools/illink/data-formats.md

@@ -382,7 +382,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
     <type fullname="Assembly.A">
       <field name="MyTypeField">
         <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-          <argument>DefaultConstructor</argument>
+          <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
         </attribute>
       </field>
     </type>
@@ -398,7 +398,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
     <type fullname="Assembly.A">
       <property name="MyTypeProperty">
         <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-          <argument>DefaultConstructor</argument>
+          <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
         </attribute>
       </property>
     </type>
@@ -414,7 +414,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
     <type fullname="Assembly.A">
       <event name="MyTypeEvent">
         <attribute fullname="CustomAttribute" assembly="AssemblyName">
-          <argument>DefaultConstructor</argument>
+          <argument>ArgumentValue</argument>
         </attribute>
       </event>
     </type>
@@ -431,21 +431,21 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
       <method signature="System.Void Method1(System.Type)">
         <parameter name="typeParameter">
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>DefaultConstructor</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
           </attribute>
         </parameter>
       </method>
       <method signature="System.Type Method2()">
         <return>
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>PublicConstructors</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
           </attribute>
         </return>
       </method>
       <method signature="Method3&lt;T&gt;(T)">
         <parameter name="genericParameter">
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>DefaultConstructor</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
           </attribute>
         </parameter>
       </method>
@@ -463,17 +463,17 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
       <method signature="System.Void Method1(System.Type, System.Type, System.Type)">
         <parameter name="typeParameter1">
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>DefaultConstructor</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
           </attribute>
         </parameter>
         <parameter name="typeParameter2">
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>DefaultConstructor</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
           </attribute>
         </parameter>
         <parameter name="typeParameter3">
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>PublicConstructors</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
           </attribute>
         </parameter>
       </method>
@@ -491,7 +491,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
       <type name="NestedType">
         <property name="MyTypeField">
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>DefaultConstructor</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
           </attribute>
         </property>
       </type>
@@ -507,7 +507,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
   <assembly fullname="*">
     <type fullname="Namespace.SpecialAttribute">
       <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-        <argument>DefaultConstructor</argument>
+        <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
       </attribute>
     </type>
   </assembly>
@@ -528,7 +528,7 @@ attributes are applied.
       <method signature="System.String TestMethod()">
         <return>
           <attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
-            <argument>PublicConstructors</argument>
+            <argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
           </attribute>
         </return>
       </method>

docs/workflow/README.md

@@ -78,12 +78,14 @@ Now you know about configurations and how we use them, so now you will want to r
 
 * [Building CoreCLR runtime](/docs/workflow/building/coreclr/README.md)
 * [Building Mono runtime](/docs/workflow/building/mono/README.md)
+* [Building NativeAOT runtime](/docs/workflow/building/coreclr/nativeaot.md)
 * [Building Libraries](/docs/workflow/building/libraries/README.md)
 
 After that, here's information about how to run tests:
 
 * [Testing CoreCLR runtime](/docs/workflow/testing/coreclr/testing.md)
 * [Testing Mono runtime](/docs/workflow/testing/mono/testing.md)
+* [Testing NativeAOT runtime](/docs/workflow/building/coreclr/nativeaot.md#running-tests)
 * [Testing Libraries](/docs/workflow/testing/libraries/testing.md)
 
 And how to measure performance:

docs/workflow/building/coreclr/linux-instructions.md

@@ -54,13 +54,13 @@ The images used for our official builds can be found in [the pipeline resources]
 
 | Host OS               | Target OS    | Target Arch     | Image                                                                                  | crossrootfs dir      |
 | --------------------- | ------------ | --------------- | -------------------------------------------------------------------------------------- | -------------------- |
-| Azure Linux (x64)     | Alpine 3.13  | x64             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-alpine-net9.0` | `/crossrootfs/x64`   |
-| Azure Linux (x64)     | Ubuntu 16.04 | x64             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-net9.0`        | `/crossrootfs/x64`   |
-| Azure Linux (x64)     | Alpine       | arm32 (armhf)   | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm-alpine-net9.0`   | `/crossrootfs/arm`   |
-| Azure Linux (x64)     | Ubuntu 16.04 | arm32 (armhf)   | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm-net9.0`          | `/crossrootfs/arm`   |
-| Azure Linux (x64)     | Alpine       | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm64-alpine-net9.0` | `/crossrootfs/arm64` |
-| Azure Linux (x64)     | Ubuntu 16.04 | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm64-net9.0`        | `/crossrootfs/arm64` |
-| Azure Linux (x64)     | Ubuntu 16.04 | x86             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-x86-net9.0`          | `/crossrootfs/x86`   |
+| Azure Linux (x64)     | Alpine 3.13  | x64             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-alpine` | `/crossrootfs/x64`   |
+| Azure Linux (x64)     | Ubuntu 16.04 | x64             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64`        | `/crossrootfs/x64`   |
+| Azure Linux (x64)     | Alpine       | arm32 (armhf)   | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine`   | `/crossrootfs/arm`   |
+| Azure Linux (x64)     | Ubuntu 16.04 | arm32 (armhf)   | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm`          | `/crossrootfs/arm`   |
+| Azure Linux (x64)     | Alpine       | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64-alpine` | `/crossrootfs/arm64` |
+| Azure Linux (x64)     | Ubuntu 16.04 | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64`        | `/crossrootfs/arm64` |
+| Azure Linux (x64)     | Ubuntu 16.04 | x86             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-x86`          | `/crossrootfs/x86`   |
 
 Notes:
 
@@ -70,21 +70,21 @@ Notes:
 
 The following images are used for more extended scenarios, including for community-supported builds, and may require different patterns of use.
 
-| Host OS               | Target OS    | Target Arch     | Image                                                                                  | crossrootfs dir      |
-| --------------------- | ------------ | --------------- | -------------------------------------------------------------------------------------- | -------------------- |
-| Azure Linux (x64)     | Android Bionic | x64           | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-android-amd64-net9.0`|                      |
-| Azure Linux (x64)     | Android Bionic (w/OpenSSL) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-android-openssl-net9.0`  |                      |
-| Azure Linux (x64)     | Android Bionic (w/Docker) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-android-docker-net9.0`    |                      |
-| Azure Linux (x64)     | Azure Linux 3.0 | x64          | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-fpm-net9.0`                |                      |
-| Azure Linux (x64)     | FreeBSD 13   | x64             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-freebsd-13-net9.0`   | `/crossrootfs/x64`   |
-| Azure Linux (x64)     | Ubuntu 18.04 | PPC64le         | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-ppc64le-net9.0`      | `/crossrootfs/ppc64le` |
-| Azure Linux (x64)     | Ubuntu 24.04 | RISC-V          | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-riscv64-net9.0`      | `/crossrootfs/riscv64` |
-| Azure Linux (x64)     | Ubuntu 18.04 | S390x           | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-s390x-net9.0`        | `/crossrootfs/s390x` |
-| Azure Linux (x64)     | Ubuntu 16.04 (Wasm) | x64      | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-webassembly-amd64-net9.0`  | `/crossrootfs/x64`   |
-| Debian (x64)          | Debian 12    | x64             | `mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64`                    | `/crossrootfs/armv6` |
-| Ubuntu (x64)          | Ubuntu 22.04 | x64             | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg`                      |                      |
-| Ubuntu (x64)          | Tizen 9.0    | Arm32 (armel)   | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-armel-tizen`           | `/crossrootfs/armel` |
-| Ubuntu (x64)          | Ubuntu 20.04 | Arm32 (v6)      | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10`     | `/crossrootfs/armv6` |
+| Host OS               | Target OS                  | Target Arch       | Image                                                                                  | crossrootfs dir        |
+| --------------------- | -------------------------- | ----------------- | -------------------------------------------------------------------------------------- | ---------------------- |
+| Azure Linux (x64)     | Android Bionic             | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-android-amd64`|                        |
+| Azure Linux (x64)     | Android Bionic (w/OpenSSL) | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-openssl`    |                        |
+| Azure Linux (x64)     | Android Bionic (w/Docker)  | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-docker`     |                        |
+| Azure Linux (x64)     | Azure Linux 3.0            | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-fpm`                |                        |
+| Azure Linux (x64)     | FreeBSD 13                 | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-freebsd-13`   | `/crossrootfs/x64`     |
+| Azure Linux (x64)     | Ubuntu 18.04               | PPC64le           | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-ppc64le`      | `/crossrootfs/ppc64le` |
+| Azure Linux (x64)     | Ubuntu 24.04               | RISC-V            | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-riscv64`      | `/crossrootfs/riscv64` |
+| Azure Linux (x64)     | Ubuntu 18.04               | S390x             | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-s390x`        | `/crossrootfs/s390x`   |
+| Azure Linux (x64)     | Ubuntu 16.04 (Wasm)        | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64`  | `/crossrootfs/x64`     |
+| Debian (x64)          | Debian 12                  | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64`                    | `/crossrootfs/armv6`   |
+| Ubuntu (x64)          | Ubuntu 22.04               | x64               | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg`                      |                        |
+| Ubuntu (x64)          | Tizen 9.0                  | Arm32 (armel)     | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-armel-tizen`           | `/crossrootfs/armel`   |
+| Ubuntu (x64)          | Ubuntu 20.04               | Arm32 (v6)        | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10`     | `/crossrootfs/armv6`   |
 
 ## Build using your own Environment
 

docs/workflow/building/coreclr/nativeaot.md

@@ -87,6 +87,8 @@ If you haven't built the tests yet, run `src\tests\build.cmd nativeaot [Debug|Re
 
 To run all the tests that got built, run `src\tests\run.cmd runnativeaottests [Debug|Release]` on Windows, or `src/tests/run.sh --runnativeaottests [Debug|Release]` on Linux. The `Debug`/`Release` flag should match the flag that was passed to `build.cmd` in the previous step.
 
+To build an individual test, follow the instructions for compiling a individual test project located in [Building an Individual Test](/docs/workflow/testing/coreclr/testing.md#building-an-individual-test), but add `/t:BuildNativeAot /p:TestBuildMode=nativeaot` to the build command.
+
 To run an individual test (after it was built), navigate to the `artifacts\tests\coreclr\[windows|linux|osx[.x64.[Debug|Release]\$path_to_test` directory. `$path_to_test` matches the subtree of `src\tests`. You should see a `[.cmd|.sh]` file there. This file is a script that will compile and launch the individual test for you. Before invoking the script, set the following environment variables:
 
 * CORE_ROOT=$repo_root\artifacts\tests\coreclr\[windows|linux|osx].x64.[Debug|Release]\Tests\Core_Root

docs/workflow/ci/disabling-tests.md

@@ -63,6 +63,8 @@ in the [issues.targets](../../../src/tests/issues.targets) file. Additionally, t
 link to a GitHub issue in the `<Issue>` element. Disabling a test here can be conditioned on processor
 architecture, runtime, and operating system.
 
+### Disabling runtime tests (src/tests) with test configuration properties
+
 However, some test configurations must be disabled by editing the `.csproj` or `.ilproj` file for the test,
 and inserting a property in a `<PropertyGroup>`, as follows: