public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-10282] libphobos: Increase size of defaultStackPages on OSX X86_64 targets.
@ 2021-11-19 14:14 Iain Buclaw
  0 siblings, 0 replies; only message in thread
From: Iain Buclaw @ 2021-11-19 14:14 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:651a542822d4eea7d6328ad365bb45d1d52acc1e

commit r10-10282-g651a542822d4eea7d6328ad365bb45d1d52acc1e
Author: Iain Buclaw <ibuclaw@gdcproject.org>
Date:   Fri Nov 19 14:43:07 2021 +0100

    libphobos: Increase size of defaultStackPages on OSX X86_64 targets.
    
    As of macOS 11, libunwind now requires more stack space than 16k, so
    default to a larger stack size. This is only applied to X86 as the
    PAGESIZE is still 4k, however on AArch64 it is 16k.
    
    libphobos/ChangeLog:
    
            * libdruntime/core/thread.d (defaultStackPages): New constant.
            (Fiber.this): Set stack size to be a multiple of defaultStackPages.
    
    (cherry picked from commit f316727e5f6a4c58b63bdee9ad6be785f97f5ee7)

Diff:
---
 libphobos/libdruntime/core/thread.d | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/libphobos/libdruntime/core/thread.d b/libphobos/libdruntime/core/thread.d
index e1a68057ca1..79cd40c6fdd 100644
--- a/libphobos/libdruntime/core/thread.d
+++ b/libphobos/libdruntime/core/thread.d
@@ -4146,6 +4146,24 @@ class Fiber
     // Initialization
     ///////////////////////////////////////////////////////////////////////////
 
+    version (Windows)
+        // exception handling walks the stack, invoking DbgHelp.dll which
+        // needs up to 16k of stack space depending on the version of DbgHelp.dll,
+        // the existence of debug symbols and other conditions. Avoid causing
+        // stack overflows by defaulting to a larger stack size
+        enum defaultStackPages = 8;
+    else version (OSX)
+    {
+        version (X86_64)
+            // libunwind on macOS 11 now requires more stack space than 16k, so
+            // default to a larger stack size. This is only applied to X86 as
+            // the PAGESIZE is still 4k, however on AArch64 it is 16k.
+            enum defaultStackPages = 8;
+        else
+            enum defaultStackPages = 4;
+    }
+    else
+        enum defaultStackPages = 4;
 
     /**
      * Initializes a fiber object which is associated with a static
@@ -4160,7 +4178,7 @@ class Fiber
      * In:
      *  fn must not be null.
      */
-    this( void function() fn, size_t sz = PAGESIZE*4,
+    this( void function() fn, size_t sz = PAGESIZE * defaultStackPages,
           size_t guardPageSize = PAGESIZE ) nothrow
     in
     {
@@ -4186,7 +4204,7 @@ class Fiber
      * In:
      *  dg must not be null.
      */
-    this( void delegate() dg, size_t sz = PAGESIZE*4,
+    this( void delegate() dg, size_t sz = PAGESIZE * defaultStackPages,
           size_t guardPageSize = PAGESIZE ) nothrow
     in
     {


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-11-19 14:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-19 14:14 [gcc r10-10282] libphobos: Increase size of defaultStackPages on OSX X86_64 targets Iain Buclaw

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).