aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/cp-gimplify.c2
-rw-r--r--gcc/testsuite/g++.dg/cpp2a/constexpr-virtual18.C13
2 files changed, 14 insertions, 1 deletions
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 1c5e15b..abb8a6e 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -1386,7 +1386,7 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data)
break;
}
- if (tree fndecl = cp_get_callee_fndecl (stmt))
+ if (tree fndecl = cp_get_callee_fndecl_nofold (stmt))
if (DECL_IMMEDIATE_FUNCTION_P (fndecl))
{
gcc_assert (source_location_current_p (fndecl));
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-virtual18.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-virtual18.C
new file mode 100644
index 0000000..2fbf0b2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-virtual18.C
@@ -0,0 +1,13 @@
+// PR c++/99132
+// { dg-do compile { target c++11 } }
+
+template <class T> struct A { T c; };
+template <class T> struct B {
+ A<T> d;
+ constexpr T operator-> () { return d.c; }
+ B (B &&);
+};
+struct C {
+ virtual void foo ();
+ void bar (B<C *> h) { h->foo (); }
+};