aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2022-02-17 22:45:34 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2022-02-17 22:45:34 -0500
commit46b738ffc2bf27c1c0bf0492f8c646c4496819dc (patch)
treebfad592f5d0452c7554f4931936c904ca667c3de /src
parent0dc0284ade4ade315982d1300cb87006b42e72c3 (diff)
downloadpostgresql-46b738ffc2bf27c1c0bf0492f8c646c4496819dc.tar.gz
postgresql-46b738ffc2bf27c1c0bf0492f8c646c4496819dc.zip
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.c12
-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, 21 insertions, 8 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 1e0936e5b48..1193b8e24b1 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -1028,7 +1028,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 7bc03ae4edc..3abcbb538f7 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -3280,7 +3280,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)
@@ -3290,8 +3292,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 cca9704d2d7..fafeb4b7d0b 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -93,13 +93,12 @@ InitPostmasterChild(void)
IsUnderPostmaster = true; /* we are a postmaster subprocess now */
/*
- * 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 66c53c52bbc..2711c2ce9bd 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -707,6 +707,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 3c100f858c7..243d0b64fd0 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -419,6 +419,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,