c++: Fix constexpr ICE from const mismatch [PR91607]

gcc/cp/ChangeLog
2020-03-04  Jason Merrill  <jason@redhat.com>

	PR c++/91607
	* constexpr.c (constexpr_call_hasher::equal): Use
	same_type_ignoring_top_level_qualifiers_p.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3f4c1b1f6a35cdb1b60c16f40e1557583d06589e..6c4a7751662aee4d5ed916f1fc84eb31a9014ace 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-04  Jason Merrill  <jason@redhat.com>
+
+       PR c++/91607
+       * constexpr.c (constexpr_call_hasher::equal): Use
+       same_type_ignoring_top_level_qualifiers_p.
+
 2020-03-04  Martin Sebor  <msebor@redhat.com>
 
        PR c++/90938

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index b9b387ca7e9310905db00c54fb829c0d37679007..bab5935a4ebf0fec837de790321fe4c0be04c0b7 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -1088,7 +1088,8 @@ constexpr_call_hasher::equal (constexpr_call *lhs, constexpr_call *rhs)
     {
       tree lhs_arg = TREE_VALUE (lhs_bindings);
       tree rhs_arg = TREE_VALUE (rhs_bindings);
-      gcc_assert (same_type_p (TREE_TYPE (lhs_arg), TREE_TYPE (rhs_arg)));
+      gcc_assert (same_type_ignoring_top_level_qualifiers_p
+                 (TREE_TYPE (lhs_arg), TREE_TYPE (rhs_arg)));
       if (!cp_tree_equal (lhs_arg, rhs_arg))
         return false;
       lhs_bindings = TREE_CHAIN (lhs_bindings);