method.c (process_subob_fn): Make sure no_implicit_p is non-null before trying to store through it.

* method.c (process_subob_fn): Make sure no_implicit_p is non-null
	before trying to store through it.

From-SVN: r189641
This commit is contained in:
Jason Merrill 2012-07-18 21:37:07 -04:00 committed by Jason Merrill
parent 8c58d3fedf
commit 428e8826c2
2 changed files with 6 additions and 1 deletions

View File

@ -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

View File

@ -951,7 +951,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))