From 1936ace05cdfab4a25242e03c2d70921f00576cb Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 18 Jul 2012 21:36:41 -0400 Subject: [PATCH] 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: r189638 --- 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 ef4e8acdb997..8865db39ba7e 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 b0e9ece3c207..20a6c87d9a6b 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)) -- 2.39.5