c: Fix ICE with _Atomic side-effect in nested fn param decls [PR94842]

If there are _Atomic side-effects in the parameter declarations
of non-nested function, when they are parsed, current_function_decl is
NULL, the create_artificial_label created labels during build_atomic* are
then adjusted by store_parm_decls through set_labels_context_r callback.
Unfortunately, if such thing happens in nested function parameter
declarations, while those decls are parsed current_function_decl is the
parent function (and am not sure it is a good idea to temporarily clear it,
some code perhaps should be aware it is in a nested function, or it can
refer to variables from the parent function etc.) and that means
store_param_decls through set_labels_context_r doesn't adjust anything.
As those labels are emitted in the nested function body rather than in the
parent, I think it is ok to override the context in those cases.

2020-04-30  Jakub Jelinek  <jakub@redhat.com>

	PR c/94842
	* c-decl.c (set_labels_context_r): In addition to context-less
	LABEL_DECLs adjust also LABEL_DECLs with context equal to
	parent function if any.
	(store_parm_decls): Adjust comment.

	* gcc.dg/pr94842.c: New test.

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 83d1ccc8edc8f31e52313f932dac621ded78fe69..878f45b85889ebe54e0d32c40350c14c1c3454a6 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2020-04-30  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/94842
+       * c-decl.c (set_labels_context_r): In addition to context-less
+       LABEL_DECLs adjust also LABEL_DECLs with context equal to
+       parent function if any.
+       (store_parm_decls): Adjust comment.
+
 2020-04-19  Jakub Jelinek  <jakub@redhat.com>
 
        PR objc/94637

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 0b7f4376dd350faac04a209e742ef755a37094c7..b3e05be0af87422dab71fbaed3e0731dfcc76abb 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -9722,15 +9722,18 @@ store_parm_decls_from (struct c_arg_info *arg_info)
   store_parm_decls ();
 }
 
-/* Called by walk_tree to look for and update context-less labels.  */
+/* Called by walk_tree to look for and update context-less labels
+   or labels with context in the parent function.  */
 
 static tree
 set_labels_context_r (tree *tp, int *walk_subtrees, void *data)
 {
+  tree ctx = static_cast<tree>(data);
   if (TREE_CODE (*tp) == LABEL_EXPR
-      && DECL_CONTEXT (LABEL_EXPR_LABEL (*tp)) == NULL_TREE)
+      && (DECL_CONTEXT (LABEL_EXPR_LABEL (*tp)) == NULL_TREE
+         || DECL_CONTEXT (LABEL_EXPR_LABEL (*tp)) == DECL_CONTEXT (ctx)))
     {
-      DECL_CONTEXT (LABEL_EXPR_LABEL (*tp)) = static_cast<tree>(data);
+      DECL_CONTEXT (LABEL_EXPR_LABEL (*tp)) = ctx;
       *walk_subtrees = 0;
     }
 
@@ -9800,7 +9803,11 @@ store_parm_decls (void)
         gotos, labels, etc.  Because at that time the function decl
         for F has not been created yet, those labels do not have any
         function context.  But we have the fndecl now, so update the
-        labels accordingly.  gimplify_expr would crash otherwise.  */
+        labels accordingly.  gimplify_expr would crash otherwise.
+        Or with nested functions the labels could be created with parent
+        function's context, while when the statement is emitted at the
+        start of the nested function, it needs the nested function's
+        context.  */
       walk_tree_without_duplicates (&arg_info->pending_sizes,
                                    set_labels_context_r, fndecl);
       add_stmt (arg_info->pending_sizes);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c60256477344f3663cddf8a92d6f3ac6c87d46e6..3df8a19a4d9db9b18c2c89462d9d50aa79d79dc5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-30  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/94842
+       * gcc.dg/pr94842.c: New test.
+
 2020-04-30  Martin Jambor  <mjambor@suse.cz>
 
        PR ipa/94856

diff --git a/gcc/testsuite/gcc.dg/pr94842.c b/gcc/testsuite/gcc.dg/pr94842.c
new file mode 100644 (file)
index 0000000..33d9d42
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr94842.c
@@ -0,0 +1,11 @@
+/* PR c/94842 */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+_Atomic float x = 5;
+
+void
+foo (void)
+{
+  void bar (float y[(int) (x += 2)]) {}
+}