diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-02-26 20:06:40 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-02-26 20:06:40 +0000 |
| commit | 08735f538cd94d5be5fa1b8ee79bfabc7f530a8a (patch) | |
| tree | 28763431f2806c40cc932242e482d61d55d6d68c /gcc | |
| parent | 2bb03eb72f5b55edc6deadc2e0320a046d046fa8 (diff) | |
| download | gcc-08735f538cd94d5be5fa1b8ee79bfabc7f530a8a.zip gcc-08735f538cd94d5be5fa1b8ee79bfabc7f530a8a.tar.gz gcc-08735f538cd94d5be5fa1b8ee79bfabc7f530a8a.tar.bz2 | |
re PR c++/84540 (ICE with alignas in variadic template)
/cp
2018-02-26 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84540
* pt.c (tsubst_attributes): Handle correctly tsubst_attribute
returning NULL_TREE.
(apply_late_template_attributes): Likewise.
/testsuite
2018-02-26 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84540
* g++.dg/cpp0x/alignas14.C: New.
* g++.dg/cpp0x/alignas15.C: Likewise.
From-SVN: r258012
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/alignas14.C | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/alignas15.C | 6 |
5 files changed, 27 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 94f684b..d75f1a8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2018-02-26 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84540 + * pt.c (tsubst_attributes): Handle correctly tsubst_attribute + returning NULL_TREE. + (apply_late_template_attributes): Likewise. + 2018-02-26 Jakub Jelinek <jakub@redhat.com> PR c++/84557 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9cf96e9..42fd872 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10245,9 +10245,8 @@ tsubst_attributes (tree attributes, tree args, if (subst != t) { *p = subst; - do + while (*p) p = &TREE_CHAIN (*p); - while (*p); *p = TREE_CHAIN (t); continue; } @@ -10314,9 +10313,8 @@ apply_late_template_attributes (tree *decl_p, tree attributes, int attr_flags, *p = TREE_CHAIN (t); TREE_CHAIN (t) = NULL_TREE; *q = tsubst_attribute (t, decl_p, args, complain, in_decl); - do + while (*q) q = &TREE_CHAIN (*q); - while (*q); } else p = &TREE_CHAIN (t); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9ebfd3e..f050086 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-02-26 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84540 + * g++.dg/cpp0x/alignas14.C: New. + * g++.dg/cpp0x/alignas15.C: Likewise. + 2018-02-26 Jakub Jelinek <jakub@redhat.com> PR c++/84557 diff --git a/gcc/testsuite/g++.dg/cpp0x/alignas14.C b/gcc/testsuite/g++.dg/cpp0x/alignas14.C new file mode 100644 index 0000000..498e975 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alignas14.C @@ -0,0 +1,6 @@ +// PR c++/84540 +// { dg-do compile { target c++11 } } + +template<typename... T> struct alignas(alignof(T)...) A {}; + +A<> a; diff --git a/gcc/testsuite/g++.dg/cpp0x/alignas15.C b/gcc/testsuite/g++.dg/cpp0x/alignas15.C new file mode 100644 index 0000000..7244dce --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alignas15.C @@ -0,0 +1,6 @@ +// PR c++/84540 +// { dg-do compile { target c++11 } } + +template<typename... T> struct A { enum alignas(alignof(T)...) E {}; }; + +A<> a; |