[gcc r10-9467] varasm: Fix ICE with -fsyntax-only [PR99035]

Jakub Jelinek jakub@gcc.gnu.org
Fri Mar 19 23:29:01 GMT 2021


https://gcc.gnu.org/g:a964f494cd5a90f631b8c0c01777a9899e0351ce

commit r10-9467-ga964f494cd5a90f631b8c0c01777a9899e0351ce
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Wed Feb 10 19:52:37 2021 +0100

    varasm: Fix ICE with -fsyntax-only [PR99035]
    
    My FE change from 2 years ago uses TREE_ASM_WRITTEN in -fsyntax-only
    mode more aggressively to avoid "expanding" functions multiple times.
    With -fsyntax-only nothing is really expanded, so I think it is acceptable
    to adjust the assert and allow declare_weak at any time, with -fsyntax-only
    we know it is during parsing only anyway.
    
    2021-02-10  Jakub Jelinek  <jakub@redhat.com>
    
            PR c++/99035
            * varasm.c (declare_weak): For -fsyntax-only, allow even
            TREE_ASM_WRITTEN function decls.
    
            * g++.dg/ext/weak6.C: New test.
    
    (cherry picked from commit 0f39fb7b001df7cdba56cd5c572d0737667acd2c)

Diff:
---
 gcc/testsuite/g++.dg/ext/weak6.C | 8 ++++++++
 gcc/varasm.c                     | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/g++.dg/ext/weak6.C b/gcc/testsuite/g++.dg/ext/weak6.C
new file mode 100644
index 00000000000..e9a70ee0dad
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/weak6.C
@@ -0,0 +1,8 @@
+// PR c++/99035
+// { dg-do compile }
+// { dg-require-weak "" }
+// { dg-options "-fsyntax-only" }
+
+extern void * foo (void);
+void * foo (void) { return (void *)foo; }
+#pragma weak foo
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 0e7531926f8..814d29a02de 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -5690,7 +5690,12 @@ merge_weak (tree newdecl, tree olddecl)
 void
 declare_weak (tree decl)
 {
-  gcc_assert (TREE_CODE (decl) != FUNCTION_DECL || !TREE_ASM_WRITTEN (decl));
+  /* With -fsyntax-only, TREE_ASM_WRITTEN might be set on certain function
+     decls earlier than normally, but as with -fsyntax-only nothing is really
+     emitted, there is no harm in marking it weak later.  */
+  gcc_assert (TREE_CODE (decl) != FUNCTION_DECL
+	      || !TREE_ASM_WRITTEN (decl)
+	      || flag_syntax_only);
   if (! TREE_PUBLIC (decl))
     {
       error ("weak declaration of %q+D must be public", decl);


More information about the Gcc-cvs mailing list