From c10ea0b3ef63907397c4b937a1e5f130e63cd251 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 16 Jan 2024 19:34:30 +0000
Subject: [PATCH 1/4] gh-113655: Skip test_lru_recursion during PGO runs to
 avoid C stack exhaustion

---
 Lib/test/test_functools.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 7c66b906d308ba..f6589c5ba6f9be 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1866,6 +1866,7 @@ def orig(): ...
 
     @support.skip_on_s390x
     @unittest.skipIf(support.is_wasi, "WASI has limited C stack")
+    @unittest.skipIf(support.PGO, "PGO builds may have reduced C stack")
     def test_lru_recursion(self):
 
         @self.module.lru_cache

From 379cfe3aae6336f794cd7c8f17d7dc988a74e7c5 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 16 Jan 2024 20:35:10 +0000
Subject: [PATCH 2/4] Revert functools test and expand PGO stack

---
 Lib/test/test_functools.py | 1 -
 PCbuild/python.vcxproj     | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index f6589c5ba6f9be..7c66b906d308ba 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1866,7 +1866,6 @@ def orig(): ...
 
     @support.skip_on_s390x
     @unittest.skipIf(support.is_wasi, "WASI has limited C stack")
-    @unittest.skipIf(support.PGO, "PGO builds may have reduced C stack")
     def test_lru_recursion(self):
 
         @self.module.lru_cache
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index 8b733865962373..b882aabdd83815 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -94,8 +94,9 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <StackReserveSize Condition="$(Configuration) != 'Debug'">2000000</StackReserveSize>
+      <StackReserveSize>2000000</StackReserveSize>
       <StackReserveSize Condition="$(Configuration) == 'Debug'">12000000</StackReserveSize>
+      <StackReserveSize Condition="$(Configuration) == 'PGInstrument'">12000000</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

From 7b361fce573d8e0466b310a22720401c1382bafd Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 16 Jan 2024 20:54:59 +0000
Subject: [PATCH 3/4] Update pythonw stack size settings

---
 PCbuild/pythonw.vcxproj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
index e23635e5ea9411..2acbe69b9d75ef 100644
--- a/PCbuild/pythonw.vcxproj
+++ b/PCbuild/pythonw.vcxproj
@@ -89,8 +89,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <StackReserveSize Condition="$(Configuration) != 'Debug'">2000000</StackReserveSize>
-      <StackReserveSize Condition="$(Configuration) == 'Debug'">8000000</StackReserveSize>
+      <StackReserveSize>2000000</StackReserveSize>
+      <StackReserveSize Condition="$(Configuration) == 'Debug'">12000000</StackReserveSize>
+      <StackReserveSize Condition="$(Configuration) == 'PGInstrument'">12000000</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

From 9bf58f64659244626d7e6a096d4ada8f60116892 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 16 Jan 2024 21:36:29 +0000
Subject: [PATCH 4/4] Increase PGUpdate stack

---
 PCbuild/python.vcxproj  | 2 ++
 PCbuild/pythonw.vcxproj | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index b882aabdd83815..fdf573aa5bf983 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -97,6 +97,8 @@
       <StackReserveSize>2000000</StackReserveSize>
       <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>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
index 2acbe69b9d75ef..31f21308e25fb3 100644
--- a/PCbuild/pythonw.vcxproj
+++ b/PCbuild/pythonw.vcxproj
@@ -92,6 +92,8 @@
       <StackReserveSize>2000000</StackReserveSize>
       <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>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>