summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane2022-02-18 03:45:34 +0000
committerTom Lane2022-02-18 03:46:01 +0000
commitde447bb8e6fbbad19f964a2d7f04c9ccc1d06903 (patch)
tree95aad2cc5e0c44e8d3e1fb64dfa369772715b3c0 /src
parentf927a6ec3ef710ad2bd7d9c63f524b7a22d7e664 (diff)
Suppress warning about stack_base_ptr with late-model GCC.
GCC 12 complains that set_stack_base is storing the address of a local variable in a long-lived pointer. This is an entirely reasonable warning (indeed, it just helped us find a bug); but that behavior is intentional here. We can work around it by using __builtin_frame_address(0) instead of a specific local variable; that produces an address a dozen or so bytes different, in my testing, but we don't care about such a small difference. Maybe someday a compiler lacking that function will start to issue a similar warning, but we'll worry about that when it happens. Patch by me, per a suggestion from Andres Freund. Back-patch to v12, which is as far back as the patch will go without some pain. (Recently-established project policy would permit a back-patch as far as 9.2, but I'm disinclined to expend the work until GCC 12 is much more widespread.) Discussion: https://postgr.es/m/3773792.1645141467@sss.pgh.pa.us
Diffstat (limited to 'src')
-rw-r--r--src/backend/postmaster/postmaster.c2
-rw-r--r--src/backend/tcop/postgres.c20
-rw-r--r--src/backend/utils/init/miscinit.c11
-rw-r--r--src/include/pg_config.h.in3
-rw-r--r--src/tools/msvc/Solution.pm1
5 files changed, 24 insertions, 13 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 735fed490b6..80bb2695998 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -1083,7 +1083,7 @@ PostmasterMain(int argc, char *argv[])
/*
* Set reference point for stack-depth checking.
*/
- set_stack_base();
+ (void) set_stack_base();
/*
* Initialize pipe (or process handle on Windows) that allows children to
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 38d8b97894c..3c7d08209f3 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -129,17 +129,15 @@ static long max_stack_depth_bytes = 100 * 1024L;
/*
* Stack base pointer -- initialized by PostmasterMain and inherited by
- * subprocesses. This is not static because old versions of PL/Java modify
- * it directly. Newer versions use set_stack_base(), but we want to stay
- * binary-compatible for the time being.
+ * subprocesses (but see also InitPostmasterChild).
*/
-char *stack_base_ptr = NULL;
+static char *stack_base_ptr = NULL;
/*
* On IA64 we also have to remember the register stack base.
*/
#if defined(__ia64__) || defined(__ia64)
-char *register_stack_base_ptr = NULL;
+static char *register_stack_base_ptr = NULL;
#endif
/*
@@ -3416,7 +3414,9 @@ ia64_get_bsp(void)
pg_stack_base_t
set_stack_base(void)
{
+#ifndef HAVE__BUILTIN_FRAME_ADDRESS
char stack_base;
+#endif
pg_stack_base_t old;
#if defined(__ia64__) || defined(__ia64)
@@ -3426,8 +3426,16 @@ set_stack_base(void)
old = stack_base_ptr;
#endif
- /* Set up reference point for stack depth checking */
+ /*
+ * Set up reference point for stack depth checking. On recent gcc we use
+ * __builtin_frame_address() to avoid a warning about storing a local
+ * variable's address in a long-lived variable.
+ */
+#ifdef HAVE__BUILTIN_FRAME_ADDRESS
+ stack_base_ptr = __builtin_frame_address(0);
+#else
stack_base_ptr = &stack_base;
+#endif
#if defined(__ia64__) || defined(__ia64)
register_stack_base_ptr = ia64_get_bsp();
#endif
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 0868e5a24f6..bdc77af7194 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -106,13 +106,12 @@ InitPostmasterChild(void)
#endif
/*
- * Set reference point for stack-depth checking. We re-do that even in the
- * !EXEC_BACKEND case, because there are some edge cases where processes
- * are started with an alternative stack (e.g. starting bgworkers when
- * running postgres using the rr debugger, as bgworkers are launched from
- * signal handlers).
+ * Set reference point for stack-depth checking. This might seem
+ * redundant in !EXEC_BACKEND builds; but it's not because the postmaster
+ * launches its children from signal handlers, so we might be running on
+ * an alternative stack.
*/
- set_stack_base();
+ (void) set_stack_base();
InitProcessGlobals();
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 28a1f0e9f0f..12aac8616e2 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -739,6 +739,9 @@
/* Define to 1 if your compiler understands __builtin_ctz. */
#undef HAVE__BUILTIN_CTZ
+/* Define to 1 if your compiler understands __builtin_frame_address. */
+#undef HAVE__BUILTIN_FRAME_ADDRESS
+
/* Define to 1 if your compiler understands __builtin_$op_overflow. */
#undef HAVE__BUILTIN_OP_OVERFLOW
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index e6f20679dce..439809fcd00 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -439,6 +439,7 @@ sub GenerateFiles
HAVE__BUILTIN_CLZ => undef,
HAVE__BUILTIN_CONSTANT_P => undef,
HAVE__BUILTIN_CTZ => undef,
+ HAVE__BUILTIN_FRAME_ADDRESS => undef,
HAVE__BUILTIN_OP_OVERFLOW => undef,
HAVE__BUILTIN_POPCOUNT => undef,
HAVE__BUILTIN_TYPES_COMPATIBLE_P => undef,