diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-01-20 17:53:44 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-01-20 17:53:44 +0000 |
| commit | 4b9f2115114eb2c3acee32ed1898201a761fd215 (patch) | |
| tree | 7262c5cac6c88e5b1835b9d970045eb9e0c66ce7 /gcc | |
| parent | f14d2c52d4c815b89513abec58acc16f6e7dfb78 (diff) | |
| download | gcc-4b9f2115114eb2c3acee32ed1898201a761fd215.zip gcc-4b9f2115114eb2c3acee32ed1898201a761fd215.tar.gz gcc-4b9f2115114eb2c3acee32ed1898201a761fd215.tar.bz2 | |
PR c++/78495 - wrong code inherited ctor and invisi-ref parm
PR c++/78495 - wrong code inherited ctor and invisi-ref parm
* cp-gimplify.c (cp_generize_r): Don't skip thunks.
PR c++/79495
* g++.dg/cpp1z/inh-ctor38.C: New.
From-SVN: r244728
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/inh-ctor38.C | 31 |
4 files changed, 42 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9b71c90..d1ad2eb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-01-20 Nathan Sidwell <nathan@acm.org> + + PR c++/78495 - wrong code inherited ctor and invisi-ref parm + * cp-gimplify.c (cp_generize_r): Don't skip thunks. + 2017-01-20 David Malcolm <dmalcolm@redhat.com> PR c++/77829 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index e792cfd..2c59c07 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -1103,15 +1103,7 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data) && omp_var_to_track (stmt)) omp_cxx_notice_variable (wtd->omp_ctx, stmt); - /* Don't dereference parms in a thunk, pass the references through. */ - if ((TREE_CODE (stmt) == CALL_EXPR && CALL_FROM_THUNK_P (stmt)) - || (TREE_CODE (stmt) == AGGR_INIT_EXPR && AGGR_INIT_FROM_THUNK_P (stmt))) - { - *walk_subtrees = 0; - return NULL; - } - - /* Otherwise, do dereference invisible reference parms. */ + /* Dereference invisible reference parms. */ if (wtd->handle_invisiref_parm_p && is_invisiref_parm (stmt)) { *stmt_p = convert_from_reference (stmt); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 69ba36c..dbbe345 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-01-20 Nathan Sidwell <nathan@acm.org> + + PR c++/79495 + * g++.dg/cpp1z/inh-ctor38.C: New. + 2017-01-20 Marek Polacek <polacek@redhat.com> PR c/79152 diff --git a/gcc/testsuite/g++.dg/cpp1z/inh-ctor38.C b/gcc/testsuite/g++.dg/cpp1z/inh-ctor38.C new file mode 100644 index 0000000..fbee8ca --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/inh-ctor38.C @@ -0,0 +1,31 @@ +// { dg-do run { target c++11 } } +// PR78495 failed to propagate pass-by-value struct to base ctor. + +struct Ptr { + void *ptr = 0; + + Ptr() {} + Ptr(Ptr const&) = delete; + Ptr(Ptr&& other) : ptr (other.ptr) {} +}; + +struct Base { + Ptr val; + Base(Ptr val_) : val(static_cast<Ptr&&>(val_)) {} +}; + +struct Derived: Base { + using Base::Base; +}; + +void *Foo () { + Ptr ptr; + + Derived d(static_cast<Ptr&&>(ptr)); + + return d.val.ptr; +} + +int main () { + return Foo () != 0; +} |