Merge branch 'main' into fix/docs-lazycs-summary-111921

Author: amritanand-py

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "10.0.0-prerelease.25475.1",
+      "version": "10.0.0-prerelease.25506.2",
       "commands": [
         "xharness"
       ]

.github/copilot-instructions.md

@@ -2,6 +2,8 @@
 
 You MUST make your best effort to ensure your changes satisfy those criteria before committing. If for any reason you were unable to build or test the changes, you MUST report that. You MUST NOT claim success unless all builds and tests pass as described above.
 
+Do not complete without checking the relevant code builds and relevant tests still pass after the last edits you make. Do not simply assume that your changes fix test failures you see, actually build and run those tests again to confirm.
+
 You MUST refer to the [Building & Testing in dotnet/runtime](#building--testing-in-dotnetruntime) instructions and use the commands and approaches specified there before attempting your own suggestions.
 
 You MUST follow all code-formatting and naming conventions defined in [`.editorconfig`](/.editorconfig).
@@ -187,6 +189,8 @@ From the repository root:
     - [Build Libraries](/docs/workflow/building/libraries/README.md)
     - [Testing Libraries](/docs/workflow/testing/libraries/testing.md)
 
+When working on changes limited to a specific library, do not complete without at least running all tests for that library and confirming they pass. For example if you are working within "System.Text.RegularExpressions" then make sure after your last edits that all the test libraries under `src\libraries\System.Text.RegularExpressions\tests` pass. It is OK to filter to relevant specific tests during your work, but before returning, ensure that, at least, ALL tests for the library do pass.
+
 ### 5.1. How To: Identify Affected Libraries
 
 For each changed file under `src/libraries/`, find the matching library and its test project(s).

.github/policies/resourceManagement.yml

@@ -751,7 +751,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - cston
+            - 333fred
             replyTemplate: >-
               Tagging subscribers to this area: ${mentionees}
 
@@ -775,7 +775,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - cston
+            - 333fred
             replyTemplate: >-
               Tagging subscribers to this area: ${mentionees}
 
@@ -1100,7 +1100,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - cston
+            - 333fred
             replyTemplate: >-
               Tagging subscribers to this area: ${mentionees}
 
@@ -1226,7 +1226,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - cston
+            - 333fred
             replyTemplate: >-
               Tagging subscribers to this area: ${mentionees}
 

.github/prompts/add-new-jit-ee-api.prompt.md

@@ -1,23 +1,23 @@
 ---
 mode: 'agent'
-tools: ['githubRepo', 'codebase', 'terminalLastCommand']
+tools: ['fetch', 'codebase', 'runCommands', 'usages', 'search', 'think']
 description: 'Add a new API to the JIT-VM (aka JIT-EE) interface in the codebase.'
 ---
 
 #### 1 — Goal
 
-Implement **one** new JIT-VM (also known as JIT-EE) API and all supporting glue. 
+Implement **one** new JIT-VM (also known as JIT-EE) API and all supporting glue.
 The JIT-VM interface defines the APIs through which the JIT compiler communicates with the runtime (VM).
 
 #### 2 — Prerequisites for the model
 
 * You have full repo access
-* You may run scripts (e.g., `.sh` or `.bat`) 
+* You may run scripts (e.g., `.sh` or `.bat`)
 * Ask **clarifying questions** before the first code change if anything (signature, types, platform constraints) is unclear.
 
 #### 3 — Required user inputs
 
-Ask the user for a C-like signature of the new API if it's not provided. 
+Ask the user for a C-like signature of the new API if it's not provided.
 Suggest `<repo_root>/src/coreclr/tools/Common/JitInterface/ThunkGenerator/ThunkInput.txt` file as a reference. Example:
 
 ```
@@ -83,8 +83,8 @@ Use the correct directory for the script to run.
 +}
 ```
 
-6. Now implement the most complex part - SuperPMI. SuperPMI acts as a (de)serializer for JIT-VM queries in order 
-to then replay them without the actual VM to speed up jit-diffs and other scenarios. All parameters and return 
+6. Now implement the most complex part - SuperPMI. SuperPMI acts as a (de)serializer for JIT-VM queries in order
+to then replay them without the actual VM to speed up jit-diffs and other scenarios. All parameters and return
 values recorded/restored using special primitve types and helpers. We need to update the following files:
 
 * `<repo_root>/src/coreclr/tools/superpmi/superpmi-shared/agnostic.h`:
@@ -96,7 +96,7 @@ Go through each of them one by one.
 
 * `<repo_root>/src/coreclr/tools/superpmi/superpmi-shared/agnostic.h`:
 Define two `Agnostic_*` types for input arguments and another one for output parameters (return value, output arguments).
- Do not create them if one of the generics ones can be re-used such as `DLD`, `DD`, `DLDL`, etc. Use `DWORD*` 
+ Do not create them if one of the generics ones can be re-used such as `DLD`, `DD`, `DLDL`, etc. Use `DWORD*`
  like types for integers. Inspect the whole file to see how other APIs are defined.
 
 * `<repo_root>/src/coreclr/tools/superpmi/superpmi-shared/lwmlist.h`:
@@ -126,7 +126,7 @@ Now add a new element to `enum mcPackets` enum in the same file. Example:
 ```
 
 * `<repo_root>/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp`:
-Add the implementation of the 3 methods to `methodcontext.cpp` at the end of it. 
+Add the implementation of the 3 methods to `methodcontext.cpp` at the end of it.
 Consider other similar methods in the file for reference. Do not change implementations of other methods in the file. Example:
 
 ```diff

.github/workflows/markdownlint.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Use Node.js
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version: 'lts/*'
     - name: Run Markdownlint

NuGet.config

@@ -21,8 +21,6 @@
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
     <add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
-    <!-- Need for prototype Roslyn compiler for runtime-async -->
-    <add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

THIRD-PARTY-NOTICES.TXT

@@ -102,33 +102,6 @@ http://www.apache.org/licenses/
 Copyright The OpenTelemetry Authors
 
 
-License notice for LinuxTracepoints
------------------------------------
-
-https://github.com/microsoft/LinuxTracepoints/blob/main/LICENSE
-
-Copyright (c) Microsoft Corporation.
-
-MIT License
-
-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 Mono
 -------------------------------
 

docs/design/datacontracts/Thread.md

@@ -233,7 +233,7 @@ TargetPointer IThread.GetThreadLocalStaticBase(TargetPointer threadPointer, Targ
             }
             break;
         case TLSIndexType.DirectOnThreadLocalData:
-            threadLocalStaticBase = threadLocalDataPtr;
+            threadLocalStaticBase = threadLocalDataPtr + indexOffset;
             break;
     }
     if (threadLocalStaticBase == TargetPointer.Null)

docs/design/datacontracts/contract-descriptor.md

@@ -86,13 +86,17 @@ a JSON integer constant.
     "s_pThreadStore": [ 0 ], // indirect from pointer data offset 0
     "RuntimeID": "win-x64" // string value
   },
+  "sub-descriptors":
+  {
+    "GCDescriptor": [ 1 ]
+  },
   "contracts": {"Thread": 1, "GCHandle": 1, "ThreadStore": 1}
 }
 ```
 
 ## Contract symbol
 
-To aid in discovery, the contract descriptor should be exported by the module hosting the .NET
+To aid in discovery, the main contract descriptor should be exported by the module hosting the .NET
 runtime with the name `DotNetRuntimeContractDescriptor` using the C symbol naming conventions of the
 target platform.
 

docs/design/datacontracts/data_descriptor.md

@@ -31,6 +31,7 @@ endianness.  The types `nint`, `nuint` and `pointer` have target architecture po
 The data descriptor consists of:
 * a collection of type structure descriptors
 * a collection of global value descriptors
+* an optional collection of pointers to sub-descriptors
 
 ## Types
 
@@ -92,6 +93,15 @@ The value must be an integral constant within the range of its type.  Signed val
 natural encoding.  Pointer values need not be aligned and need not point to addressable target
 memory.
 
+## Sub-descriptor descriptors
+
+Each sub-descriptor descriptor is effectively a global with a type of `pointer`. They will consist of:
+* a name
+* a pointer value
+
+If the value is non-null, the pointer points to another [contract descriptor](contract-descriptor.md#contract-descriptor-1).
+
+When parsing a data descriptor with sub-descriptors each sub-descriptor should be parsed then its type, global, and contract values should be merged in. If any conflicts arise when merging in sub-descriptor data, this is an error and behavior is undefined.
 
 ## Physical descriptors
 
@@ -129,6 +139,7 @@ The toplevel dictionary will contain:
 * optional `"baseline": "BASELINE_ID"` see below
 * `"types": TYPES_DESCRIPTOR` see below
 * `"globals": GLOBALS_DESCRIPTOR` see below
+* optional `"sub-descriptors": SUB_DESCRIPTORS_DESCRIPTOR` see below
 
 Additional toplevel keys may be present. For example, the in-memory data descriptor will contain a
 `"contracts"` key (see [contract descriptor](./contract_descriptor.md#Compatible_contracts)) for the
@@ -233,7 +244,9 @@ Note that a two element array is unambiguously "type and value", whereas a one-e
 unambiguously "indirect value".
 
 
-**Both formats**
+### Sub-descriptor Values
+
+Sub-descriptor values will be an additional array, with the same specification as [global values](#Global-values) with the exception that the only valid value type is a `pointer`.
 
 #### Specification Appendix
 
@@ -284,7 +297,7 @@ string.  For pointers, the address can be stored at a known offset in an in-proc
 array of pointers and the offset written into the constant JSON string.
 
 The indirection array is not part of the data descriptor spec.  It is part of the [contract
-descriptor](./contract_descriptor.md#Contract_descriptor).
+descriptor](./contract-descriptor.md#Contract_descriptor).
 
 
 ## Example
@@ -345,6 +358,10 @@ The following is an example of an in-memory descriptor that references the above
     "FEATURE_COMINTEROP": 0,
     "s_pThreadStore": [ 0 ], // indirect from aux data offset 0
     "RuntimeID": "windows-x64"
+  },
+  "sub-descriptors": 
+  {
+    "GC": [ 1 ] // indirect from aux data offset 1
   }
 }
 ```