diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-04-11 16:05:02 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo.carlini@oracle.com> | 2013-04-11 16:05:02 +0000 |
| commit | 23e8f05e1e1e6f0d4743f88f151d52d305fa335e (patch) | |
| tree | eebef7641e28421a5fbfc4ccfaf05efe0e54c5e0 /gcc/cp | |
| parent | 89ca4c8ec8bfa27845ba1fcc9dd60b4d4a75057e (diff) | |
/cp
2013-04-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56913
* typeck2.c (build_m_component_ref): Protect error calls with
(complain & tf_error).
/testsuite
2013-04-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56913
* g++.dg/cpp0x/sfinae44.C: New.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@197814 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 04df55e728e..78aeeba646a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-04-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/56913 + * typeck2.c (build_m_component_ref): Protect error calls with + (complain & tf_error). + 2013-04-10 Jakub Jelinek <jakub@redhat.com> PR c++/56895 diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 4b7544a5066..9b7db62183d 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1659,11 +1659,19 @@ build_m_component_ref (tree datum, tree component, tsubst_flags_t complain) { bool lval = real_lvalue_p (datum); if (lval && FUNCTION_RVALUE_QUALIFIED (type)) - error ("pointer-to-member-function type %qT requires an rvalue", - ptrmem_type); + { + if (complain & tf_error) + error ("pointer-to-member-function type %qT requires an rvalue", + ptrmem_type); + return error_mark_node; + } else if (!lval && !FUNCTION_RVALUE_QUALIFIED (type)) - error ("pointer-to-member-function type %qT requires an lvalue", - ptrmem_type); + { + if (complain & tf_error) + error ("pointer-to-member-function type %qT requires an lvalue", + ptrmem_type); + return error_mark_node; + } } return build2 (OFFSET_REF, type, datum, component); } |