Skip to content

Commit

Permalink
Merge branch 'dotnet:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@steveberdy
steveberdy authored Jul 13, 2021
2 parents bdd1e36 + dfd618d commit 80cbbe2
Show file tree
Hide file tree
Showing 488 changed files with 10,884 additions and 4,963 deletions.
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>d7db669b70f4dd67ec001c192f9809c218cab88b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0-preview.7.21358.1">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0-preview.7.21362.2">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5c9145289bd4d4e14b18a544dda60a185f66f688</Sha>
<Sha>7e218d66bf9ec3ca4fc70c0b63e9a162f2e33451</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down Expand Up @@ -82,41 +82,41 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21357.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -154,37 +154,37 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.7.21355.1">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.7.21361.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6</Sha>
<Sha>98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.7.21355.1">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.7.21361.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6</Sha>
<Sha>98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.7.21355.1">
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.7.21361.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6</Sha>
<Sha>98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.7.21355.1">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.7.21361.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6</Sha>
<Sha>98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.7.21355.1">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.7.21361.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6</Sha>
<Sha>98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="6.0.0-preview.7.21355.1">
<Dependency Name="System.Text.Json" Version="6.0.0-preview.7.21361.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6</Sha>
<Sha>98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c</Sha>
</Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.7.21355.1">
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.7.21361.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6</Sha>
<Sha>98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21357.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21358.3">
<Uri>https://github.com/mono/linker</Uri>
<Sha>35a1c74d6a0dbd115bf079dc986cea59cdb01430</Sha>
<Sha>b9501922637806f4135df09a9922d5540e203858</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21357.4">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand All @@ -198,29 +198,29 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>286d98094b830b8dad769542b2669cb1b75f7097</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21357.3">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21361.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>a89f052e97fec59a2d0148c08d3b4801567ec200</Sha>
<Sha>ae45cbdfa6d15fce7e3cf089462f0d2b55727273</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21357.3">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21361.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>a89f052e97fec59a2d0148c08d3b4801567ec200</Sha>
<Sha>ae45cbdfa6d15fce7e3cf089462f0d2b55727273</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21357.3">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21361.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>a89f052e97fec59a2d0148c08d3b4801567ec200</Sha>
<Sha>ae45cbdfa6d15fce7e3cf089462f0d2b55727273</Sha>
</Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21357.3">
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21361.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>a89f052e97fec59a2d0148c08d3b4801567ec200</Sha>
<Sha>ae45cbdfa6d15fce7e3cf089462f0d2b55727273</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21355.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21361.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>3960ef9a8980181e840b5c1d64ed0b234711e850</Sha>
<Sha>640e908a67b5bc63fa615d31c7877e62c2b15062</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.21356.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.21358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334</Sha>
<Sha>3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21356.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
48 changes: 24 additions & 24 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Opt-in/out repo features -->
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
<!-- TODO: Upgrade compiler version to enable Static Abstracts in Interfaces; remove this once the employed SDK uses a new enough version. -->
<MicrosoftNetCompilersToolsetVersion>4.0.0-2.21323.11</MicrosoftNetCompilersToolsetVersion>
<!-- TODO: Upgrade compiler version to enable Static Abstracts in Interfaces and interpolated string handlers; remove this once the employed SDK uses a new enough version. -->
<MicrosoftNetCompilersToolsetVersion>4.0.0-3.21362.7</MicrosoftNetCompilersToolsetVersion>
<UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolXliff>false</UsingToolXliff>
Expand Down Expand Up @@ -69,11 +69,11 @@
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.7.21355.1</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.7.21355.1</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.7.21361.10</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.7.21361.10</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.7.21355.1</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.7.21361.10</MicrosoftNETCoreILAsmVersion>
<!-- Libraries dependencies -->
<MicrosoftBclAsyncInterfacesVersion>5.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
Expand Down Expand Up @@ -107,27 +107,27 @@
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<ServiceModelVersion>4.8.1</ServiceModelVersion>
<SystemTextJsonVersion>6.0.0-preview.7.21355.1</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.7.21355.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemTextJsonVersion>6.0.0-preview.7.21361.10</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.7.21361.10</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-preview.7.21355.1</runtimenativeSystemIOPortsVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-preview.7.21361.10</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.21356.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21356.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21356.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.21356.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.21356.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.21356.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.21356.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21356.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21356.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21356.1</SystemWindowsExtensionsTestDataVersion>
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.21358.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21358.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21358.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.21358.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.21358.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.21358.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.21358.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21358.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21358.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21358.1</SystemWindowsExtensionsTestDataVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21357.3</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21357.3</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21357.3</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21357.3</optimizationPGOCoreCLRVersion>
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21361.3</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21361.3</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21361.3</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21361.3</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>
Expand All @@ -153,7 +153,7 @@
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21357.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21357.4</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21355.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21361.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand All @@ -164,7 +164,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.6.21357.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.6.21358.3</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.7.21328.1</MicrosoftNETCoreRuntimeICUTransportVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21357.3",
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21355.1"
"Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10"
}
}
12 changes: 4 additions & 8 deletions src/coreclr/jit/gentree.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14856,19 +14856,15 @@ GenTree* Compiler::gtFoldExprConst(GenTree* tree)
JITDUMP("\nFolding operator with constant nodes into a constant:\n");
DISPTREE(tree);

#ifdef TARGET_64BIT
// Some operations are performed as 64 bit instead of 32 bit so the upper 32 bits
// need to be discarded. Since constant values are stored as ssize_t and the node
// has TYP_INT the result needs to be sign extended rather than zero extended.
i1 = INT32(i1);
#endif // TARGET_64BIT

// Also all conditional folding jumps here since the node hanging from
// GT_JTRUE has to be a GT_CNS_INT - value 0 or 1.

tree->ChangeOperConst(GT_CNS_INT);
tree->ChangeType(TYP_INT);
tree->AsIntCon()->SetIconValue(i1);
// Some operations are performed as 64 bit instead of 32 bit so the upper 32 bits
// need to be discarded. Since constant values are stored as ssize_t and the node
// has TYP_INT the result needs to be sign extended rather than zero extended.
tree->AsIntCon()->SetIconValue(static_cast<int>(i1));
tree->AsIntCon()->gtFieldSeq = fieldSeq;
if (vnStore != nullptr)
{
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/jit/gentree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6801,6 +6801,7 @@ struct GenTreeCopyOrReload : public GenTreeUnOp

GenTreeCopyOrReload(genTreeOps oper, var_types type, GenTree* op1) : GenTreeUnOp(oper, type, op1)
{
assert(type != TYP_STRUCT || op1->IsMultiRegNode());
SetRegNum(REG_NA);
ClearOtherRegs();
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/jitconfigvalues.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ CONFIG_INTEGER(JitSaveFpLrWithCalleeSavedRegisters, W("JitSaveFpLrWithCalleeSave
#endif // defined(TARGET_ARM64)
#endif // DEBUG

#if defined(TARGET_AMD64) && defined(TARGET_WINDOWS)
#if defined(TARGET_WINDOWS) && defined(TARGET_XARCH)
CONFIG_INTEGER(JitEnregStructLocals, W("JitEnregStructLocals"), 1) // Allow to enregister locals with struct type.
#else
CONFIG_INTEGER(JitEnregStructLocals, W("JitEnregStructLocals"), 0) // Don't allow to enregister locals with struct type
Expand Down
Loading

0 comments on commit 80cbbe2

Please sign in to comment.