diff options
| author | Jason Merrill <jason@redhat.com> | 2016-08-09 10:08:33 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-08-09 10:08:33 -0400 |
| commit | 23f4e590fb4ce718e58cd736c19d7e6959429500 (patch) | |
| tree | c3a29fcafb7f701ec0f5d594553534aebd2aa13d | |
| parent | b87060ce92628c3c81754149d2d8a7e2733fb495 (diff) | |
| download | gcc-23f4e590fb4ce718e58cd736c19d7e6959429500.zip gcc-23f4e590fb4ce718e58cd736c19d7e6959429500.tar.gz gcc-23f4e590fb4ce718e58cd736c19d7e6959429500.tar.bz2 | |
PR c++/56701 - wrong type of &*this
* typeck.c (cp_build_addr_expr_1): Remove special *this handling.
From-SVN: r239285
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/rv-this2.C | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1f032c7..7b746ca 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2016-08-09 Jason Merrill <jason@redhat.com> + + PR c++/56701 + * typeck.c (cp_build_addr_expr_1): Remove special *this handling. + 2016-08-09 Jakub Jelinek <jakub@redhat.com> PR c++/72809 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 78d443b..bedc453 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5626,11 +5626,6 @@ cp_build_addr_expr_1 (tree arg, bool strict_lvalue, tsubst_flags_t complain) /* Let &* cancel out to simplify resulting code. */ if (INDIRECT_REF_P (arg)) { - /* We don't need to have `current_class_ptr' wrapped in a - NON_LVALUE_EXPR node. */ - if (arg == current_class_ref) - return current_class_ptr; - arg = TREE_OPERAND (arg, 0); if (TREE_CODE (TREE_TYPE (arg)) == REFERENCE_TYPE) { diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-this2.C b/gcc/testsuite/g++.dg/cpp0x/rv-this2.C new file mode 100644 index 0000000..fcfd265 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/rv-this2.C @@ -0,0 +1,8 @@ +// PR c++/56701 +// { dg-do compile { target c++11 } } + +struct A +{ + void f(){ A*&& a = &*this; } +}; +int main(){} |