diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-02-21 01:08:59 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-02-21 01:08:59 +0100 |
| commit | 73ab3eb732462887817e000a23b86b8a24641c07 (patch) | |
| tree | be689c2ac368b51d9ebde07c66eb5b3647c30faa | |
| parent | 37d7267f8093e6720b05fec5a8eac26ade0b55ad (diff) | |
| download | gcc-73ab3eb732462887817e000a23b86b8a24641c07.zip gcc-73ab3eb732462887817e000a23b86b8a24641c07.tar.gz gcc-73ab3eb732462887817e000a23b86b8a24641c07.tar.bz2 | |
re PR c++/89405 (ICE in import_export_decl, at cp/decl2.c:2959)
PR c++/89405
* decl.c (maybe_commonize_var): When clearing TREE_PUBLIC and
DECL_COMMON, set DECL_INTERFACE_KNOWN.
* g++.dg/cpp1z/inline-var5.C: New test.
From-SVN: r269058
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/inline-var5.C | 11 |
4 files changed, 19 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fabcb1a..58df2b5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2019-02-20 Jakub Jelinek <jakub@redhat.com> + PR c++/89405 + * decl.c (maybe_commonize_var): When clearing TREE_PUBLIC and + DECL_COMMON, set DECL_INTERFACE_KNOWN. + PR c++/89336 * constexpr.c (cxx_eval_store_expression): Diagnose changing of active union member for -std=c++17 and earlier. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c164975..acde010 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5634,6 +5634,7 @@ maybe_commonize_var (tree decl) be merged. */ TREE_PUBLIC (decl) = 0; DECL_COMMON (decl) = 0; + DECL_INTERFACE_KNOWN (decl) = 1; const char *msg; if (DECL_INLINE_VAR_P (decl)) msg = G_("sorry: semantics of inline variable " diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 32a68cc..d8d6ef9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2019-02-20 Jakub Jelinek <jakub@redhat.com> + PR c++/89405 + * g++.dg/cpp1z/inline-var5.C: New test. + PR middle-end/89412 * gcc.c-torture/compile/pr89412.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp1z/inline-var5.C b/gcc/testsuite/g++.dg/cpp1z/inline-var5.C new file mode 100644 index 0000000..111c978 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/inline-var5.C @@ -0,0 +1,11 @@ +// PR c++/89405 +// { dg-do compile { target c++17 } } +// { dg-options "-fno-weak" } + +template <int N> +struct S +{ + static constexpr int a = N; // { dg-warning "semantics of inline variable" } +}; // { dg-message "you can work around this" "" { target *-*-* } .-1 } + +const int *x = &S<0>::a; |