Skip to content

Commit 6208256

Browse files
radicalradical
committed
Merge remote-tracking branch 'origin/main' into debugger-tests
2 parents d5fb973 + fedf64f commit 6208256

File tree

49 files changed

+599
-823
lines changed

Some content is hidden

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

49 files changed

+599
-823
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
5555
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
5656

57-
<NetCoreAppLatestStableVersion>5.0</NetCoreAppLatestStableVersion>
57+
<NetCoreAppLatestStableVersion>6.0</NetCoreAppLatestStableVersion>
5858
<NetCoreAppLatestStablePackageBaselineVersion>$(NetCoreAppLatestStableVersion).0</NetCoreAppLatestStablePackageBaselineVersion>
5959
<NetCoreAppLatestStable>net$(NetCoreAppLatestStableVersion)</NetCoreAppLatestStable>
6060

‎eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@
126126
<Uri>https://github.com/dotnet/runtime-assets</Uri>
127127
<Sha>6003aa6296ad2bebdf8147de94afbea9b5f16264</Sha>
128128
</Dependency>
129+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.21602.1">
130+
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131+
<Sha>6003aa6296ad2bebdf8147de94afbea9b5f16264</Sha>
132+
</Dependency>
129133
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.21602.1">
130134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131135
<Sha>6003aa6296ad2bebdf8147de94afbea9b5f16264</Sha>

‎eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.21602.1</SystemPrivateRuntimeUnicodeDataVersion>
128128
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.21602.1</SystemRuntimeTimeZoneDataVersion>
129129
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.21602.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
130+
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.21602.1</SystemTextRegularExpressionsTestDataVersion>
130131
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.21602.1</SystemWindowsExtensionsTestDataVersion>
131132
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.21602.1</MicrosoftDotNetCilStripSourcesVersion>
132133
<!-- dotnet-optimization dependencies -->

‎eng/pipelines/runtime-manual.yml

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -332,47 +332,46 @@ jobs:
332332
eq(variables['isManualOrIsNotPR'], true),
333333
eq(variables['isFullMatrix'], true))
334334
335-
# Disabled due to https://github.com/dotnet/runtime/issues/61721
336-
#- template: /eng/pipelines/common/platform-matrix.yml
337-
#parameters:
338-
#jobTemplate: /eng/pipelines/common/global-build-job.yml
339-
#helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
340-
#buildConfig: release
341-
#runtimeFlavor: mono
342-
#platforms:
343-
#- Browser_wasm_win
344-
#variables:
345-
## map dependencies variables to local variables
346-
#- name: librariesContainsChange
347-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
348-
#- name: monoContainsChange
349-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
350-
#jobParameters:
351-
#testGroup: innerloop
352-
#nameSuffix: Windows_wasm_AOT
353-
#buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
354-
#timeoutInMinutes: 180
355-
#condition: >-
356-
#or(
357-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
358-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
359-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
360-
#eq(variables['isManualOrIsNotPR'], true),
361-
#eq(variables['isFullMatrix'], true))
362-
## extra steps, run tests
363-
#extraStepsTemplate: /eng/pipelines/libraries/helix.yml
364-
#extraStepsParameters:
365-
#creator: dotnet-bot
366-
#testRunNamePrefixSuffix: Mono_$(_BuildConfig)
367-
#extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
368-
#scenarios:
369-
#- normal
370-
#condition: >-
371-
#or(
372-
#eq(variables['librariesContainsChange'], true),
373-
#eq(variables['monoContainsChange'], true),
374-
#eq(variables['isManualOrIsNotPR'], true),
375-
#eq(variables['isFullMatrix'], true))
335+
- template: /eng/pipelines/common/platform-matrix.yml
336+
parameters:
337+
jobTemplate: /eng/pipelines/common/global-build-job.yml
338+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
339+
buildConfig: release
340+
runtimeFlavor: mono
341+
platforms:
342+
- Browser_wasm_win
343+
variables:
344+
# map dependencies variables to local variables
345+
- name: librariesContainsChange
346+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
347+
- name: monoContainsChange
348+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
349+
jobParameters:
350+
testGroup: innerloop
351+
nameSuffix: Windows_wasm_AOT
352+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
353+
timeoutInMinutes: 180
354+
condition: >-
355+
or(
356+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
357+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
358+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
359+
eq(variables['isManualOrIsNotPR'], true),
360+
eq(variables['isFullMatrix'], true))
361+
# extra steps, run tests
362+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
363+
extraStepsParameters:
364+
creator: dotnet-bot
365+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
366+
extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
367+
scenarios:
368+
- normal
369+
condition: >-
370+
or(
371+
eq(variables['librariesContainsChange'], true),
372+
eq(variables['monoContainsChange'], true),
373+
eq(variables['isManualOrIsNotPR'], true),
374+
eq(variables['isFullMatrix'], true))
376375
377376
#
378377
# Build for Browser/wasm, with EnableAggressiveTrimming=true

‎eng/pipelines/runtime-staging.yml

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -493,47 +493,44 @@ jobs:
493493
# Build Browser_wasm, on windows, and run tests with AOT
494494
#
495495
# Disabled due to https://github.com/dotnet/runtime/issues/61721
496-
#- template: /eng/pipelines/common/platform-matrix.yml
497-
#parameters:
498-
#jobTemplate: /eng/pipelines/common/global-build-job.yml
499-
#helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
500-
#buildConfig: release
501-
#runtimeFlavor: mono
502-
#platforms:
503-
#- Browser_wasm_win
504-
#variables:
505-
## map dependencies variables to local variables
506-
#- name: librariesContainsChange
507-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
508-
#- name: monoContainsChange
509-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
510-
#jobParameters:
511-
#testGroup: innerloop
512-
#nameSuffix: Windows_wasm_AOT
513-
#buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
514-
#timeoutInMinutes: 180
515-
#condition: >-
516-
#or(
517-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
518-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
519-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
520-
#eq(variables['isManualOrIsNotPR'], true),
521-
#eq(variables['isFullMatrix'], true))
522-
## extra steps, run tests
523-
#extraStepsTemplate: /eng/pipelines/libraries/helix.yml
524-
#extraStepsParameters:
525-
#creator: dotnet-bot
526-
#testRunNamePrefixSuffix: Mono_$(_BuildConfig)
527-
#extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
528-
#scenarios:
529-
#- normal
530-
#condition: >-
531-
#or(
532-
#eq(variables['librariesContainsChange'], true),
533-
#eq(variables['monoContainsChange'], true),
534-
#eq(variables['isManualOrIsNotPR'], true),
535-
#eq(variables['isFullMatrix'], true))
536-
496+
- template: /eng/pipelines/common/platform-matrix.yml
497+
parameters:
498+
jobTemplate: /eng/pipelines/common/global-build-job.yml
499+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
500+
buildConfig: release
501+
runtimeFlavor: mono
502+
platforms:
503+
- Browser_wasm_win
504+
variables:
505+
# map dependencies variables to local variables
506+
- name: librariesContainsChange
507+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
508+
- name: monoContainsChange
509+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
510+
jobParameters:
511+
testGroup: innerloop
512+
nameSuffix: Windows_wasm_AOT
513+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
514+
timeoutInMinutes: 180
515+
condition: >-
516+
or(
517+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
518+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
519+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
520+
eq(variables['isFullMatrix'], true))
521+
# extra steps, run tests
522+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
523+
extraStepsParameters:
524+
creator: dotnet-bot
525+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
526+
extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
527+
scenarios:
528+
- normal
529+
condition: >-
530+
or(
531+
eq(variables['librariesContainsChange'], true),
532+
eq(variables['monoContainsChange'], true),
533+
eq(variables['isFullMatrix'], true))
537534
538535
#
539536
# Build Browser_wasm, on windows, and run Wasm.Build.Tests

‎src/coreclr/jit/hwintrinsicarm64.cpp

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,22 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
308308
var_types retType,
309309
unsigned simdSize)
310310
{
311-
HWIntrinsicCategory category = HWIntrinsicInfo::lookupCategory(intrinsic);
312-
int numArgs = sig->numArgs;
311+
const HWIntrinsicCategory category = HWIntrinsicInfo::lookupCategory(intrinsic);
312+
const int numArgs = sig->numArgs;
313+
314+
// The vast majority of "special" intrinsics are Vector64/Vector128 methods.
315+
// The only exception is ArmBase.Yield which should be treated differently.
316+
if (intrinsic == NI_ArmBase_Yield)
317+
{
318+
assert(sig->numArgs == 0);
319+
assert(JITtype2varType(sig->retType) == TYP_VOID);
320+
assert(simdSize == 0);
321+
322+
return gtNewScalarHWIntrinsicNode(TYP_VOID, intrinsic);
323+
}
324+
325+
assert(category != HW_Category_Scalar);
326+
assert(!HWIntrinsicInfo::isScalarIsa(HWIntrinsicInfo::lookupIsa(intrinsic)));
313327

314328
if (!featureSIMD || !IsBaselineSimdIsaSupported())
315329
{
@@ -318,13 +332,8 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
318332

319333
assert(numArgs >= 0);
320334

321-
var_types simdBaseType = TYP_UNKNOWN;
322-
323-
if (intrinsic != NI_ArmBase_Yield)
324-
{
325-
simdBaseType = JitType2PreciseVarType(simdBaseJitType);
326-
assert(varTypeIsArithmetic(simdBaseType));
327-
}
335+
const var_types simdBaseType = JitType2PreciseVarType(simdBaseJitType);
336+
assert(varTypeIsArithmetic(simdBaseType));
328337

329338
GenTree* retNode = nullptr;
330339
GenTree* op1 = nullptr;
@@ -333,16 +342,6 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
333342

334343
switch (intrinsic)
335344
{
336-
case NI_ArmBase_Yield:
337-
{
338-
assert(sig->numArgs == 0);
339-
assert(JITtype2varType(sig->retType) == TYP_VOID);
340-
assert(simdSize == 0);
341-
342-
retNode = gtNewScalarHWIntrinsicNode(TYP_VOID, intrinsic);
343-
break;
344-
}
345-
346345
case NI_Vector64_Abs:
347346
case NI_Vector128_Abs:
348347
{

‎src/coreclr/jit/hwintrinsiclistarm64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ HARDWARE_INTRINSIC(Aes, PolynomialMultiplyWideningUpper,
627627
// Base Intrinsics
628628
HARDWARE_INTRINSIC(ArmBase, LeadingZeroCount, 0, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_clz, INS_clz, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_Scalar, HW_Flag_BaseTypeFromFirstArg|HW_Flag_NoFloatingPointUsed)
629629
HARDWARE_INTRINSIC(ArmBase, ReverseElementBits, 0, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_rbit, INS_rbit, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_Scalar, HW_Flag_NoFloatingPointUsed)
630-
HARDWARE_INTRINSIC(ArmBase, Yield, 0, 0, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_Special, HW_Flag_SpecialCodeGen|HW_Flag_SpecialImport)
630+
HARDWARE_INTRINSIC(ArmBase, Yield, 0, 0, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_Special, HW_Flag_NoFloatingPointUsed|HW_Flag_SpecialCodeGen|HW_Flag_SpecialImport)
631631

632632
// ***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
633633
// ISA Function name SIMD size Number of arguments Instructions Category Flags

‎src/coreclr/jit/lower.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,12 @@ GenTree* Lowering::NewPutArg(GenTreeCall* call, GenTree* arg, fgArgTabEntry* inf
12571257
}
12581258
else if (!arg->OperIs(GT_FIELD_LIST))
12591259
{
1260+
#ifdef TARGET_ARM
1261+
assert((info->GetStackSlotsNumber() == 1) ||
1262+
((arg->TypeGet() == TYP_DOUBLE) && (info->GetStackSlotsNumber() == 2)));
1263+
#else
12601264
assert(varTypeIsSIMD(arg) || (info->GetStackSlotsNumber() == 1));
1265+
#endif
12611266
}
12621267
}
12631268
#endif // FEATURE_PUT_STRUCT_ARG_STK

‎src/libraries/Common/src/Internal/Cryptography/HashProviderCng.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,15 @@ public override void Reset()
127127
{
128128
if (_reusable && !_running)
129129
return;
130+
130131
DestroyHash();
131132

133+
BCryptCreateHashFlags flags = _reusable ?
134+
BCryptCreateHashFlags.BCRYPT_HASH_REUSABLE_FLAG :
135+
BCryptCreateHashFlags.None;
136+
132137
SafeBCryptHashHandle hHash;
133-
NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, _key, _key == null ? 0 : _key.Length, BCryptCreateHashFlags.None);
138+
NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, _key, _key == null ? 0 : _key.Length, flags);
134139
if (ntStatus != NTSTATUS.STATUS_SUCCESS)
135140
throw Interop.BCrypt.CreateCryptographicException(ntStatus);
136141

‎src/libraries/Microsoft.Extensions.DependencyModel/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/libraries/Microsoft.Win32.Registry.AccessControl/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/libraries/System.Collections.Immutable/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/libraries/System.Composition.AttributedModel/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/libraries/System.Composition.Convention/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/libraries/System.Composition.Hosting/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)