aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-11-27 15:55:18 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-11-27 15:55:18 +0000
commit6f831b6df7a8cff16e7127beeb89ba6e32688196 (patch)
tree1494b1e6efd3f7322415da0ae3316d1356daab59 /gcc/cp
parent2e25208425c34892071ee65a99e80bb56fb19b20 (diff)
downloadgcc-6f831b6df7a8cff16e7127beeb89ba6e32688196.zip
gcc-6f831b6df7a8cff16e7127beeb89ba6e32688196.tar.gz
gcc-6f831b6df7a8cff16e7127beeb89ba6e32688196.tar.bz2
re PR c++/58647 (ICE with function pointer)
/cp 2013-11-27 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58647 * semantics.c (cxx_eval_constant_expression, [COMPONENT_REF]): Handle function COMPONENT_REFs. /testsuite 2013-11-27 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58647 * g++.dg/parse/crash66.C: New. From-SVN: r205449
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c10
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c45ddbe..cbae6c4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-27 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/58647
+ * semantics.c (cxx_eval_constant_expression, [COMPONENT_REF]):
+ Handle function COMPONENT_REFs.
+
2013-11-27 Aldy Hernandez <aldyh@redhat.com>
Jakub Jelinek <jakub@redhat.com>
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index e72a9c2..bc10f1d 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -9603,6 +9603,16 @@ cxx_eval_constant_expression (const constexpr_call *call, tree t,
break;
case COMPONENT_REF:
+ if (is_overloaded_fn (t))
+ {
+ /* We can only get here in checking mode via
+ build_non_dependent_expr, because any expression that
+ calls or takes the address of the function will have
+ pulled a FUNCTION_DECL out of the COMPONENT_REF. */
+ gcc_checking_assert (allow_non_constant);
+ *non_constant_p = true;
+ return t;
+ }
r = cxx_eval_component_reference (call, t, allow_non_constant, addr,
non_constant_p, overflow_p);
break;