From 5a972d86c7df8713dae0167a69b2d3522176cbf2 Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 19 Jul 2012 01:37:07 +0000 Subject: [PATCH 1/1] * 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/branches/gcc-4_7-branch@189641 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/method.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3711dc64334..d567568b68f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2012-07-18 Jason Merrill + + * method.c (process_subob_fn): Make sure no_implicit_p is non-null + before trying to store through it. + 2012-07-17 Jason Merrill PR c++/53995 diff --git a/gcc/cp/method.c b/gcc/cp/method.c index c46c372b61c..c4947d1d45c 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -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)) -- 2.11.0