re PR c++/36870 (__has_nothrow_constructor violates the ODR)

/cp
2008-07-21  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/36870
	* semantics.c (classtype_has_nothrow_assign_or_copy_p): Use
	TYPE_NOTHROW_P, not TREE_NOTHROW.
	(trait_expr_value): Likewise.

/testsuite
2008-07-21  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/36870
	* g++.dg/ext/has_nothrow_assign_odr.C: New.
	* g++.dg/ext/has_nothrow_copy_odr.C: Likewise.
	* g++.dg/ext/has_nothrow_constructor_odr.C: Likewise.
	* g++.dg/ext/has_nothrow_assign.C: Adjust.
	* g++.dg/ext/has_nothrow_copy.C: Likewise.
	* g++.dg/ext/has_nothrow_constructor.C: Likewise.

From-SVN: r138024

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2112b8fd8e68768f4c4e279c166702e702a706f3..913f3284ba901e0a8ffa2a61cf4afd9960db158b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/36870
+       * semantics.c (classtype_has_nothrow_assign_or_copy_p): Use
+       TYPE_NOTHROW_P, not TREE_NOTHROW.
+       (trait_expr_value): Likewise.
+
 2008-07-18  Dodji Seketeli  <dseketel@redhat.com>
 
        PR c++/36407

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index d2f56ea810a312f4d79ac34f55285841806aca49..3b91ddb0f9015cd7ec9f0794470603b1acc73362 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -4677,7 +4677,7 @@ classtype_has_nothrow_assign_or_copy_p (tree type, bool assign_p)
     return false;
 
   for (; fns; fns = OVL_NEXT (fns))
-    if (!TREE_NOTHROW (OVL_CURRENT (fns)))
+    if (!TYPE_NOTHROW_P (TREE_TYPE (OVL_CURRENT (fns))))
       return false;
 
   return true;
@@ -4712,7 +4712,8 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
       type1 = strip_array_types (type1);
       return (trait_expr_value (CPTK_HAS_TRIVIAL_CONSTRUCTOR, type1, type2) 
              || (CLASS_TYPE_P (type1)
-                 && (t = locate_ctor (type1, NULL)) && TREE_NOTHROW (t)));
+                 && (t = locate_ctor (type1, NULL))
+                 && TYPE_NOTHROW_P (TREE_TYPE (t))));
 
     case CPTK_HAS_TRIVIAL_CONSTRUCTOR:
       type1 = strip_array_types (type1);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bd32d6c68bcf3da670105e74c8466efd4e43ffe7..13f146817809e0ae65eb7b010a5bf7d72ace0025 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/36870
+       * g++.dg/ext/has_nothrow_assign_odr.C: New.
+       * g++.dg/ext/has_nothrow_copy_odr.C: Likewise.
+       * g++.dg/ext/has_nothrow_constructor_odr.C: Likewise.
+       * g++.dg/ext/has_nothrow_assign.C: Adjust.
+       * g++.dg/ext/has_nothrow_copy.C: Likewise.
+       * g++.dg/ext/has_nothrow_constructor.C: Likewise.
+
 2008-07-17  Andreas Krebbel  <krebbel1@de.ibm.com>
 
        PR target/36822

diff --git a/gcc/testsuite/g++.dg/ext/has_nothrow_assign.C b/gcc/testsuite/g++.dg/ext/has_nothrow_assign.C
index 525cac7aa483197a4a7bd7a3ee4990030b9332c1..73a904eac25761c9e8ff856d7b3cd3f7d70e8146 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/has_nothrow_assign.C
+++ b/gcc/testsuite/g++.dg/ext/has_nothrow_assign.C
@@ -136,19 +136,13 @@ int main()
   assert (PTEST (C));
   assert (NTEST (C[]));
   assert (PTEST (D));
-#ifndef __PIC__
-  assert (PTEST (E));
-#endif
+  assert (NTEST (E));
   assert (NTEST (E1));
   assert (PTEST (F));
   assert (PTEST (G));
-#ifndef __PIC__
-  assert (PTEST (H));
-#endif
+  assert (NTEST (H));
   assert (NTEST (H1));
-#ifndef __PIC__
-  assert (PTEST (I));
-#endif
+  assert (NTEST (I));
   assert (NTEST (I1));
   assert (PTEST (J));
   assert (NTEST (const K));

diff --git a/gcc/testsuite/g++.dg/ext/has_nothrow_assign_odr.C b/gcc/testsuite/g++.dg/ext/has_nothrow_assign_odr.C
new file mode 100644 (file)
index 0000000..c38d76d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/has_nothrow_assign_odr.C
@@ -0,0 +1,16 @@
+// PR c++/36870
+// { dg-do "run" }
+#include <cassert>
+
+struct S { const S& operator= (const S&); };
+
+bool f ();
+
+int main ()
+{
+  assert (__has_nothrow_assign (S) == f ());
+}
+
+const S& S::operator= (const S&) { }
+
+bool f () { return __has_nothrow_assign (S); }

diff --git a/gcc/testsuite/g++.dg/ext/has_nothrow_constructor.C b/gcc/testsuite/g++.dg/ext/has_nothrow_constructor.C
index 7e747bcd11ee02054f744d3f9c214b00ea872993..60e9be8d0be4e10cf1dafd78b972c95a5d82462a 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/has_nothrow_constructor.C
+++ b/gcc/testsuite/g++.dg/ext/has_nothrow_constructor.C
@@ -97,9 +97,7 @@ int main()
   assert (PTEST (C));
   assert (PTEST (C[]));
   assert (PTEST (D));
-#ifndef __PIC__
-  assert (PTEST (E));
-#endif
+  assert (NTEST (E));
   assert (NTEST (E1));
   assert (NTEST (F));
   assert (NTEST (G));

diff --git a/gcc/testsuite/g++.dg/ext/has_nothrow_constructor_odr.C b/gcc/testsuite/g++.dg/ext/has_nothrow_constructor_odr.C
new file mode 100644 (file)
index 0000000..775e74a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/has_nothrow_constructor_odr.C
@@ -0,0 +1,16 @@
+// PR c++/36870
+// { dg-do "run" }
+#include <cassert>
+
+struct S { S (); };
+
+bool f ();
+
+int main ()
+{
+  assert (__has_nothrow_constructor (S) == f ());
+}
+
+S::S () { }
+
+bool f () { return __has_nothrow_constructor (S); }

diff --git a/gcc/testsuite/g++.dg/ext/has_nothrow_copy.C b/gcc/testsuite/g++.dg/ext/has_nothrow_copy.C
index 6843d51b4c4b383fa1db3b37e68b75795fde08b3..e8507cf582c4b152de647938736e9d6599d5c2bf 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/has_nothrow_copy.C
+++ b/gcc/testsuite/g++.dg/ext/has_nothrow_copy.C
@@ -126,19 +126,13 @@ int main()
   assert (PTEST (C));
   assert (NTEST (C[]));
   assert (PTEST (D));
-#ifndef __PIC__
-  assert (PTEST (E));
-#endif
+  assert (NTEST (E));
   assert (NTEST (E1));
   assert (PTEST (F));
   assert (PTEST (G));
-#ifndef __PIC__
-  assert (PTEST (H));
-#endif
+  assert (NTEST (H));
   assert (NTEST (H1));
-#ifndef __PIC__
-  assert (PTEST (I));
-#endif
+  assert (NTEST (I));
   assert (NTEST (I1));  
   assert (PTEST (J));
 

diff --git a/gcc/testsuite/g++.dg/ext/has_nothrow_copy_odr.C b/gcc/testsuite/g++.dg/ext/has_nothrow_copy_odr.C
new file mode 100644 (file)
index 0000000..499a11e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/has_nothrow_copy_odr.C
@@ -0,0 +1,16 @@
+// PR c++/36870
+// { dg-do "run" }
+#include <cassert>
+
+struct S { S (const S&); };
+
+bool f ();
+
+int main ()
+{
+  assert (__has_nothrow_copy (S) == f ());
+}
+
+S::S (const S&) { }
+
+bool f () { return __has_nothrow_copy (S); }