From: Steve Dower <steve.dower@python.org>
Date: Mon, 22 Jan 2024 21:19:16 +0000 (+0000)
Subject: gh-113655: Revert extra stack reserve in PGO builds unless UseExtraStackReserve=true... 
X-Git-Tag: v3.13.0a4~374
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=665b8f365efc4e0063f764e20d3cad13635232f3;p=thirdparty%2FPython%2Fcpython.git

gh-113655: Revert extra stack reserve in PGO builds unless UseExtraStackReserve=true (GH-114263)
---

diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index 1e5ab877488e..4a99ffc677c2 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -99,7 +99,7 @@
       <StackReserveSize Condition="$(Configuration) == 'Debug'">12000000</StackReserveSize>
       <StackReserveSize Condition="$(Configuration) == 'PGInstrument'">12000000</StackReserveSize>
       <!-- HACK: Need additional memory to avoid crashing until gh-113655 is fixed -->
-      <StackReserveSize Condition="$(Configuration) == 'PGUpdate'">3000000</StackReserveSize>
+      <StackReserveSize Condition="$(Configuration) == 'PGUpdate' and $(UseExtraStackReserve) == 'true'">3000000</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
index d6cf0c97dedb..d08c210ef8a1 100644
--- a/PCbuild/pythonw.vcxproj
+++ b/PCbuild/pythonw.vcxproj
@@ -94,7 +94,7 @@
       <StackReserveSize Condition="$(Configuration) == 'Debug'">12000000</StackReserveSize>
       <StackReserveSize Condition="$(Configuration) == 'PGInstrument'">12000000</StackReserveSize>
       <!-- HACK: Need additional memory to avoid crashing until gh-113655 is fixed -->
-      <StackReserveSize Condition="$(Configuration) == 'PGUpdate'">3000000</StackReserveSize>
+      <StackReserveSize Condition="$(Configuration) == 'PGUpdate' and $(UseExtraStackReserve) == 'true'">3000000</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>