diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-24 16:41:05 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-24 16:41:05 +0000 |
| commit | ec873e792428443c5f17c584f8ee7a54e907bd20 (patch) | |
| tree | 0e35c722ba30404ff7210b8aeaa1cdaf89ad8104 | |
| parent | 84299d2c811cbd9db9f2e55f58e2f81e60862e93 (diff) | |
| download | gcc-ec873e792428443c5f17c584f8ee7a54e907bd20.tar.gz | |
/cp
2017-10-24 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80991
* pt.c (value_dependent_expression_p, [TRAIT_EXPR]): Handle
a TREE_LIST as TRAIT_EXPR_TYPE2.
/testsuite
2017-10-24 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80991
* g++.dg/ext/is_trivially_constructible5.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254051 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 17 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/is_trivially_constructible5.C | 12 |
4 files changed, 38 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8228c8f0a9d..e24a1949d86 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-10-24 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/80991 + * pt.c (value_dependent_expression_p, [TRAIT_EXPR]): Handle + a TREE_LIST as TRAIT_EXPR_TYPE2. + 2017-10-24 Mukesh Kapoor <mukesh.kapoor@oracle.com> Paolo Carlini <paolo.carlini@oracle.com> diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ba52f3b57a6..be39da72901 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -24019,8 +24019,21 @@ value_dependent_expression_p (tree expression) case TRAIT_EXPR: { tree type2 = TRAIT_EXPR_TYPE2 (expression); - return (dependent_type_p (TRAIT_EXPR_TYPE1 (expression)) - || (type2 ? dependent_type_p (type2) : false)); + + if (dependent_type_p (TRAIT_EXPR_TYPE1 (expression))) + return true; + + if (!type2) + return false; + + if (TREE_CODE (type2) != TREE_LIST) + return dependent_type_p (type2); + + for (; type2; type2 = TREE_CHAIN (type2)) + if (dependent_type_p (TREE_VALUE (type2))) + return true; + + return false; } case MODOP_EXPR: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 42fff12c1aa..edf21e9e8b8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-24 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/80991 + * g++.dg/ext/is_trivially_constructible5.C: New. + 2017-10-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * gcc.target/i386/387-ficom-1.c: Allow for ficomp without s diff --git a/gcc/testsuite/g++.dg/ext/is_trivially_constructible5.C b/gcc/testsuite/g++.dg/ext/is_trivially_constructible5.C new file mode 100644 index 00000000000..15ea33675ed --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/is_trivially_constructible5.C @@ -0,0 +1,12 @@ +// PR c++/80991 +// { dg-do compile { target c++11 } } + +template<bool> void foo() +{ + static_assert(__is_trivially_constructible(int, int), ""); +} + +void bar() +{ + foo<true>(); +} |