diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-19 01:36:41 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-19 01:36:41 +0000 |
| commit | d70a13f878ee94b5e3b70307821fca3cd8c855e4 (patch) | |
| tree | ccf6f1cb8da3271037b9d020c70c079fd01e863e | |
| parent | 3cf84e51256c62d6fa3a7a08c251d6495d6fc484 (diff) | |
| download | gcc-d70a13f878ee94b5e3b70307821fca3cd8c855e4.tar.gz | |
* method.c (process_subob_fn): Make sure no_implicit_p is non-null
before trying to store through it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189638 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/method.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ef4e8acdb99..8865db39ba7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2012-07-18 Jason Merrill <jason@redhat.com> + + * method.c (process_subob_fn): Make sure no_implicit_p is non-null + before trying to store through it. + 2012-07-17 Jason Merrill <jason@redhat.com> PR c++/53995 diff --git a/gcc/cp/method.c b/gcc/cp/method.c index b0e9ece3c20..20a6c87d9a6 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -949,7 +949,7 @@ process_subob_fn (tree fn, bool move_p, tree *spec_p, bool *trivial_p, /* Core 1402: A non-trivial copy op suppresses the implicit declaration of the move ctor/op=. */ - if (move_p && !move_fn_p (fn) && !trivial_fn_p (fn)) + if (no_implicit_p && move_p && !move_fn_p (fn) && !trivial_fn_p (fn)) *no_implicit_p = true; if (constexpr_p && !DECL_DECLARED_CONSTEXPR_P (fn)) |