re PR c++/80991 (ICE with __is_trivially_constructible in template)

/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.

From-SVN: r254051

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8228c8f0a9db7b144ccea4832b60afa9edd4c83c..e24a1949d867cf1bb3f708364c8b45cf4bac237b 100644 (file)
--- 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 ba52f3b57a62dc6970f5c732939ca0dbe5dcba3e..be39da729013b2bccb5b7d53ea217bdbf67e53bf 100644 (file)
--- 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 42fff12c1aa7d43ffe7acd68dc6b097bcb86c589..edf21e9e8b8597542442700ad8ffc4f75e68ed54 100644 (file)
--- 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 (file)
index 0000000..15ea336
--- /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>();
+}