* except.c (check_noexcept_r): Assert that fn is POINTER_TYPE_P.

From-SVN: r226947

* except.c (check_noexcept_r): Assert that fn is POINTER_TYPE_P.
From-SVN: r226947
5c563482 · Jason Merrill · Jason Merrill · 4e1492b7 · 5c563482 · 5c563482
Commit 5c563482 authored Aug 17, 2015 by Jason Merrill Committed by Jason Merrill Aug 17, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/except.c
+3 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2015-08-17  Jason Merrill  <jason@redhat.com>
+
+	* except.c (check_noexcept_r): Assert that fn is POINTER_TYPE_P.
+
 2015-08-14  Jason Merrill  <jason@redhat.com>

 	PR c++/65974

--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -1155,7 +1155,9 @@ check_noexcept_r (tree *tp, int * /*walk_subtrees*/, void * /*data*/)
         We could use TREE_NOTHROW (t) for !TREE_PUBLIC fns, though... */
      tree fn = (code == AGGR_INIT_EXPR
 		 ? AGGR_INIT_EXPR_FN (t) : CALL_EXPR_FN (t));
-      tree type = TREE_TYPE (TREE_TYPE (fn));
+      tree type = TREE_TYPE (fn);
+      gcc_assert (POINTER_TYPE_P (type));
+      type = TREE_TYPE (type);

      STRIP_NOPS (fn);
      if (TREE_CODE (fn) == ADDR_EXPR)