PR c++/84045 - ICE with typedef and noexcept.

	* except.c (build_noexcept_spec): Use strip_typedefs_expr.

From-SVN: r257713

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 58073748315b8c01a03010e2c96cfdcbc45e5651..33746aeb23e1931150eebcb429f46f01f92bda49 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2018-02-15  Jason Merrill  <jason@redhat.com>
 
+       PR c++/84045 - ICE with typedef and noexcept.
+       * except.c (build_noexcept_spec): Use strip_typedefs_expr.
+
        PR c++/84376 - ICE with omitted template arguments.
        * pt.c (dguide_name_p): Check for IDENTIFIER_NODE.
 

diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 669bf9f6eaf5c6f2c8e02ea2293134c6ae5ad1c5..0b46698b9740f0472b4f4b1138f387ed0e08966b 100644 (file)
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -1217,6 +1217,10 @@ build_noexcept_spec (tree expr, int complain)
     {
       gcc_assert (processing_template_decl
                  || TREE_CODE (expr) == DEFERRED_NOEXCEPT);
+      if (TREE_CODE (expr) != DEFERRED_NOEXCEPT)
+       /* Avoid problems with a function type built with a dependent typedef
+          being reused in another scope (c++/84045).  */
+       expr = strip_typedefs_expr (expr);
       return build_tree_list (expr, NULL_TREE);
     }
 }

diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept32.C b/gcc/testsuite/g++.dg/cpp0x/noexcept32.C
new file mode 100644 (file)
index 0000000..9a43504
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept32.C
@@ -0,0 +1,14 @@
+// PR c++/84045
+// { dg-do compile { target c++11 } }
+
+template <typename T> struct K {
+  static const bool d = true;
+};
+template <typename T, typename> struct B {
+  typedef K<T> D;
+  void foo () noexcept (D::d);
+};
+template <typename T> struct P {
+  P () noexcept (K<T>::d);
+};
+P<int> p;