Skip to content

Commit c93800e

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #97065 from carlossanlop/release/8.0-staging
[Manual] Merge release/8.0-staging into release/8.0
2 parents 074d301 + c2d2bb3 commit c93800e

File tree

162 files changed

+5665
-4150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+5665
-4150
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.23407.2",
18+
"version": "8.0.0-prerelease.24060.1",
1919
"commands": [
2020
"xharness"
2121
]

‎NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-2fc2ffd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2fc2ffd9/nuget/v3/index.json" />
1213
<add key="darc-pub-dotnet-emsdk-201f4da" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-201f4dae/nuget/v3/index.json" />
1314
<add key="darc-pub-dotnet-emsdk-201f4da-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-201f4dae-3/nuget/v3/index.json" />
1415
<add key="darc-pub-dotnet-emsdk-201f4da-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-201f4dae-2/nuget/v3/index.json" />

‎docs/design/coreclr/botr/clr-abi.md

+35-9
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ For non-rude thread abort, the VM walks the stack, running any catch handler tha
205205

206206
For example:
207207

208-
```
208+
```cs
209209
try { // try 1
210210
try { // try 2
211211
System.Threading.Thread.CurrentThread.Abort();
@@ -221,7 +221,7 @@ L:
221221

222222
In this case, if the address returned in catch 2 corresponding to label L is outside try 1, then the ThreadAbortException re-raised by the VM will not be caught by catch 1, as is expected. The JIT needs to insert a block such that this is the effective code generation:
223223

224-
```
224+
```cs
225225
try { // try 1
226226
try { // try 2
227227
System.Threading.Thread.CurrentThread.Abort();
@@ -238,7 +238,7 @@ L:
238238

239239
Similarly, the automatic re-raise address for a ThreadAbortException can't be within a finally handler, or the VM will abort the re-raise and swallow the exception. This can happen due to call-to-finally thunks marked as "cloned finally", as described above. For example (this is pseudo-assembly-code, not C#):
240240

241-
```
241+
```cs
242242
try { // try 1
243243
try { // try 2
244244
System.Threading.Thread.CurrentThread.Abort();
@@ -254,7 +254,7 @@ L:
254254

255255
This would generate something like:
256256

257-
```
257+
```asm
258258
// beginning of 'try 1'
259259
// beginning of 'try 2'
260260
System.Threading.Thread.CurrentThread.Abort();
@@ -279,7 +279,7 @@ Finally1:
279279

280280
Note that the JIT must already insert a "step" block so the finally will be called. However, this isn't sufficient to support ThreadAbortException processing, because "L1" is marked as "cloned finally". In this case, the JIT must insert another step block that is within "try 1" but outside the cloned finally block, that will allow for correct re-raise semantics. For example:
281281

282-
```
282+
```asm
283283
// beginning of 'try 1'
284284
// beginning of 'try 2'
285285
System.Threading.Thread.CurrentThread.Abort();
@@ -397,7 +397,7 @@ To implement this requirement, for any function with EH, we create a frame-local
397397

398398
Note that the since a slot on x86 is 4 bytes, the minimum size is 16 bytes. The idea is to have 1 slot for each handler that could be possibly be invoked at the same time. For example, for:
399399

400-
```
400+
```cs
401401
try {
402402
...
403403
} catch {
@@ -417,7 +417,7 @@ When calling a finally, we set the appropriate level to 0xFC (aka "finally call"
417417

418418
Thus, calling a finally from JIT generated code looks like:
419419

420-
```
420+
```asm
421421
mov dword ptr [L_02+0x4 ebp-10H], 0 // This must happen before the 0xFC is written
422422
mov dword ptr [L_02+0x8 ebp-0CH], 252 // 0xFC
423423
push G_M52300_IG07
@@ -428,7 +428,7 @@ In this case, `G_M52300_IG07` is not the address after the 'jmp', so a simple 'c
428428

429429
The code this finally returns to looks like this:
430430

431-
```
431+
```asm
432432
mov dword ptr [L_02+0x8 ebp-0CH], 0
433433
jmp SHORT G_M52300_IG05
434434
```
@@ -477,7 +477,7 @@ Because a main function body will **always** be on the stack when one of its fun
477477

478478
There is one "corner case" in the VM implementation of WantsReportOnlyLeaf model that has implications for the code the JIT is allowed to generate. Consider this function with nested exception handling:
479479

480-
```
480+
```cs
481481
public void runtest() {
482482
try {
483483
try {
@@ -804,3 +804,29 @@ In addition to the usual registers it also preserves all float registers and `rc
804804
`CORINFO_HELP_DISPATCH_INDIRECT_CALL` takes the call address in `rax` and it reserves the right to use and trash `r10` and `r11`.
805805
The JIT uses the dispatch helper on x64 whenever possible as it is expected that the code size benefits outweighs the less accurate branch prediction.
806806
However, note that the use of `r11` in the dispatcher makes it incompatible with VSD calls where the JIT must fall back to the validator and a manual call.
807+
808+
# Notes on Memset/Memcpy
809+
810+
Generally, `memset` and `memcpy` do not provide any guarantees of atomicity. This implies that they should only be used when the memory being modified by `memset`/`memcpy` is not observable by any other thread (including GC), or when there are no atomicity requirements according to our [Memory Model](../../specs/Memory-model.md). It's especially important when we modify heap containing managed pointers - those must be updated atomically, e.g. using pointer-sized `mov` instruction (managed pointers are always aligned) - see [Atomic Memory Access](../../specs/Memory-model.md#Atomic-memory-accesses). It's worth noting that by "update" it's implied "set to zero", otherwise, we need a write barrier.
811+
812+
Examples:
813+
814+
```cs
815+
struct MyStruct
816+
{
817+
long a;
818+
string b;
819+
}
820+
821+
void Test1(ref MyStruct m)
822+
{
823+
// We're not allowed to use memset here
824+
m = default;
825+
}
826+
827+
MyStruct Test2()
828+
{
829+
// We can use memset here
830+
return default;
831+
}
832+
```

‎eng/Version.Details.xml

+48-48
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,23 @@
9090
<Sha>45dd3a73dd5b64b010c4251303b3664bb30df029</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.1">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.2">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>201f4dae9d1a1e105d8ba86d7ece61eed1f665e0</Sha>
95+
<Sha>2fc2ffd960930318f33fcaa690cbdbc55d72f52d</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.1-servicing.23571.1">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.2-servicing.24062.1">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>201f4dae9d1a1e105d8ba86d7ece61eed1f665e0</Sha>
99+
<Sha>2fc2ffd960930318f33fcaa690cbdbc55d72f52d</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23565.1">
102+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24061.1">
103103
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
104-
<Sha>95f83e27806330fec09edd96e06bba3acabe3f35</Sha>
104+
<Sha>453a37ef7ae6c335cd49b3b9ab7713c87faeb265</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23570.1">
107+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24065.1">
108108
<Uri>https://github.com/dotnet/source-build-externals</Uri>
109-
<Sha>e844aa02a05b90d8cbe499676ec6ee0f19ec4980</Sha>
109+
<Sha>83274d94c7e2ff21081b0d75ecbec2da2241f831</Sha>
110110
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
111111
</Dependency>
112112
</ProductDependencies>
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23566.1">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24060.2">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
190+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.23566.1">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24060.2">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
194+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.23566.1">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24060.2">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
198+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.23566.1">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24060.2">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
202+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.23566.1">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24060.2">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
206+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.23566.1">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24060.2">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
210+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.23566.1">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24060.2">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
214+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.23566.1">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24060.2">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
218+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.23566.1">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24060.2">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
222+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.23566.1">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24060.2">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
226+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.23566.1">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24060.2">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
230+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.23566.1">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24060.2">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
234+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.23566.1">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24060.2">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
238+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23566.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -322,17 +322,17 @@
322322
<Uri>https://github.com/dotnet/runtime</Uri>
323323
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
324324
</Dependency>
325-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23407.2">
325+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24060.1">
326326
<Uri>https://github.com/dotnet/xharness</Uri>
327-
<Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
327+
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
328328
</Dependency>
329-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23407.2">
329+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24060.1">
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331-
<Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
331+
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23407.2">
333+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24060.1">
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335-
<Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
335+
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
336336
</Dependency>
337337
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24059.4">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -354,13 +354,13 @@
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355355
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
356356
</Dependency>
357-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.23570.2">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24060.1">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>5524f726f92ef862b415793758cebbd2a1950b70</Sha>
359+
<Sha>3b7da338c73b31b943c5512dcf0e2f6dd75f601c</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.23566.1">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24060.2">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>57ca3048e3bf7c0755add6569809270290040f5d</Sha>
363+
<Sha>3b165c269b12cc194f48fde6a1a7694bece8931b</Sha>
364364
</Dependency>
365365
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>
@@ -375,13 +375,13 @@
375375
<Uri>https://github.com/dotnet/roslyn</Uri>
376376
<Sha>7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb</Sha>
377377
</Dependency>
378-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23525.2">
378+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23614.1">
379379
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
380-
<Sha>b4d9a1334d5189172977ba8fddd00bda70161e4a</Sha>
380+
<Sha>abef8ced132657943b7150f01a308e2199a17d5d</Sha>
381381
</Dependency>
382-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23525.2">
382+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23614.1">
383383
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
384-
<Sha>b4d9a1334d5189172977ba8fddd00bda70161e4a</Sha>
384+
<Sha>abef8ced132657943b7150f01a308e2199a17d5d</Sha>
385385
</Dependency>
386386
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="8.0.100">
387387
<Uri>https://github.com/dotnet/sdk</Uri>

0 commit comments

Comments
 (0)