aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2023-01-09 21:56:34 +0000
committerJoseph Myers <joseph@codesourcery.com>2023-01-09 21:56:34 +0000
commit799e2e7f023784b9cdcebfe5751d183d125b2bd8 (patch)
treeb06e62909bde04fd684f9c5265f1c3abb0d0a79b /gcc
parent150d4b02838c73b392c4da89a5acc0130c0950e0 (diff)
downloadgcc-799e2e7f023784b9cdcebfe5751d183d125b2bd8.zip
gcc-799e2e7f023784b9cdcebfe5751d183d125b2bd8.tar.gz
gcc-799e2e7f023784b9cdcebfe5751d183d125b2bd8.tar.bz2
c: Check for modifiable static compound literals in inline definitions
The C rule against modifiable objects with static storage duration in inline definitions should apply to compound literals (using the C2x feature of storage-class specifiers for compound literals) just as to variables. Add a call to record_inline_static for compound literals to make sure this case is detected. Bootstrapped with no regressions for x86_64-pc-linux-gnu. gcc/c/ * c-decl.cc (build_compound_literal): Call record_inline_static. gcc/testsuite/ * gcc.dg/c2x-complit-8.c: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c/c-decl.cc7
-rw-r--r--gcc/testsuite/gcc.dg/c2x-complit-8.c70
2 files changed, 77 insertions, 0 deletions
diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc
index e47ca67..d76ffb3 100644
--- a/gcc/c/c-decl.cc
+++ b/gcc/c/c-decl.cc
@@ -6260,6 +6260,13 @@ build_compound_literal (location_t loc, tree type, tree init, bool non_const,
DECL_USER_ALIGN (decl) = 1;
}
store_init_value (loc, decl, init, NULL_TREE);
+ if (current_scope != file_scope
+ && TREE_STATIC (decl)
+ && !TREE_READONLY (decl)
+ && DECL_DECLARED_INLINE_P (current_function_decl)
+ && DECL_EXTERNAL (current_function_decl))
+ record_inline_static (input_location, current_function_decl,
+ decl, csi_modifiable);
if (TREE_CODE (type) == ARRAY_TYPE && !COMPLETE_TYPE_P (type))
{
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-8.c b/gcc/testsuite/gcc.dg/c2x-complit-8.c
new file mode 100644
index 0000000..fb614ab
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c2x-complit-8.c
@@ -0,0 +1,70 @@
+/* Test C2x storage class specifiers in compound literals: inline function
+ constraints. */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x -pedantic-errors" } */
+
+inline void
+f1 ()
+{
+ (static int) { 123 }; /* { dg-error "static but declared in inline function 'f1' which is not static" } */
+ (static thread_local int) { 456 } ; /* { dg-error "static but declared in inline function 'f1' which is not static" } */
+ (int) { 789 };
+ (register int) { 1234 };
+}
+
+inline void
+f1e ()
+{
+ (static int) { 123 };
+ (static thread_local int) { 456 } ;
+}
+
+static inline void
+f1s ()
+{
+ (static int) { 123 };
+ (static thread_local int) { 456 } ;
+}
+
+inline void
+f2 ()
+{
+ (static const int) { 123 };
+ (static thread_local const int) { 456 };
+}
+
+inline void
+f2e ()
+{
+ (static const int) { 123 };
+ (static thread_local const int) { 456 };
+}
+
+static inline void
+f2s ()
+{
+ (static const int) { 123 };
+ (static thread_local const int) { 456 };
+}
+
+inline void
+f3 ()
+{
+ (static constexpr int) { 123 };
+}
+
+inline void
+f3e ()
+{
+ (static constexpr int) { 123 };
+}
+
+static inline void
+f3s ()
+{
+ (static constexpr int) { 123 };
+}
+
+extern void f1e ();
+extern void f2e ();
+extern void f3e ();