From: Steve Dower <steve.dower@python.org>
Date: Tue, 9 Jan 2024 17:32:22 +0000 (+0000)
Subject: gh-113650: Add workaround option for MSVC ARM64 bug affecting string encoding (GH... 
X-Git-Tag: v3.13.0a3~132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad849b4ba008bf4ff97151651e619259ddb4fc18;p=thirdparty%2FPython%2Fcpython.git

gh-113650: Add workaround option for MSVC ARM64 bug affecting string encoding (GH-113836)
---

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 06c695783ced..16ad91ef0278 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -29,6 +29,7 @@
 
     <!-- See https://developercommunity.visualstudio.com/t/Regression-in-MSVC-1433-1434-ARM64-co/10224361 -->
     <MSVCHasBrokenARM64Clamping Condition="$(_VCToolsVersion) == '14.34' or $(_VCToolsVersion) == '14.35'">true</MSVCHasBrokenARM64Clamping>
+    <MSVCHasBrokenARM64SignExtension Condition="$(_VCToolsVersion) == '14.37'">true</MSVCHasBrokenARM64SignExtension>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -62,6 +63,7 @@
       <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">-Wno-deprecated-non-prototype -Wno-unused-label -Wno-pointer-sign -Wno-incompatible-pointer-types-discards-qualifiers -Wno-unused-function %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="$(Configuration) != 'Debug' and $(PlatformToolset) == 'ClangCL'">-flto %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="$(MSVCHasBrokenARM64Clamping) == 'true' and $(Platform) == 'ARM64'">-d2pattern-opt-disable:-932189325 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="$(MSVCHasBrokenARM64SignExtension) == 'true' and $(Platform) == 'ARM64'">-d2ssa-patterns-all- %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="$(GenerateSourceDependencies) == 'true'">/sourceDependencies "$(IntDir.Trim(`\`))" %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ClCompile Condition="$(Configuration) == 'Debug'">