c++: refine decl_defined_p

As discussed in the 124770 patch.  This makes decl_defined_p correct
for more cases.

gcc/cp/ChangeLog:

	* decl2.cc (decl_defined_p): Also return true if DECL_INITIAL
	and !DECL_IN_AGGR_P is true for a VAR_DECL.

Reviewed-by: Jason Merrill <jason@redhat.com>

diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc
index a0bc57d4a06d8c8581e41a8052bb5098afdfbb05..785f669348ef4ab82b914623f578ce8fce645c9d 100644 (file)
--- a/gcc/cp/decl2.cc
+++ b/gcc/cp/decl2.cc
@@ -5324,7 +5324,13 @@ decl_defined_p (tree decl)
   else
     {
       gcc_assert (VAR_P (decl));
-      return !DECL_EXTERNAL (decl);
+      return (!DECL_EXTERNAL (decl)
+             /* An initialized variable is defined even if we've decided not
+                to emit it, unless it's initialized within the class and not
+                inline.  Note that finish_static_member_decl doesn't set
+                DECL_IN_AGGR_P for inline variables, so we don't need to check
+                DECL_INLINE_VAR_P here.  */
+             || (DECL_INITIAL (decl) && !DECL_IN_AGGR_P (decl)));
     }
 }