c-decl.c (warn_if_shadowing): Do not test DECL_FROM_INLINE.

2018-10-02  Richard Biener  <rguenther@suse.de>

	c/
	* c-decl.c (warn_if_shadowing): Do not test DECL_FROM_INLINE.

	cp/
	* name-lookup.c (check_local_shadow): Do not test DECL_FROM_INLINE.

From-SVN: r264779

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index a8e235c9f9b553d8a7553534295e75e952a6bef2..720aadcd0eac31b71844cb98b9fe41d519fdeae0 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-02  Richard Biener  <rguenther@suse.de>
+
+       * c-decl.c (warn_if_shadowing): Do not test DECL_FROM_INLINE.
+
 2018-09-26  Joseph Myers  <joseph@codesourcery.com>
 
        PR c/87390

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index fdcfbde2d993b2ef01f563870e0aa23d13bc00da..160ce357cb1628d7ac07c836dc53f67e79045b97 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -2784,9 +2784,7 @@ warn_if_shadowing (tree new_decl)
         || warn_shadow_local
         || warn_shadow_compatible_local)
       /* No shadow warnings for internally generated vars.  */
-      || DECL_IS_BUILTIN (new_decl)
-      /* No shadow warnings for vars made for inlining.  */
-      || DECL_FROM_INLINE (new_decl))
+      || DECL_IS_BUILTIN (new_decl))
     return;
 
   /* Is anything being shadowed?  Invisible decls do not count.  */

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e10ada2d7b67eaa0d4bb59c41a3cd137e3db46a6..fd0fb8a720a3350678ef577c36e506a48d7d8450 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-02  Richard Biener  <rguenther@suse.de>
+
+       * name-lookup.c (check_local_shadow): Do not test DECL_FROM_INLINE.
+
 2018-09-28  Eric Botcazou  <ebotcazou@adacore.com>
             Pierre-Marie de Rodat  <derodat@adacore.com>
 

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 95d2845dd9110aeae06be7d655470e34a2577507..08632c382b7b758432270edbd91fbfcda024940d 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -2628,10 +2628,6 @@ check_local_shadow (tree decl)
   if (TREE_CODE (decl) == PARM_DECL && !DECL_CONTEXT (decl))
     return;
 
-  /* Inline decls shadow nothing.  */
-  if (DECL_FROM_INLINE (decl))
-    return;
-
   /* External decls are something else.  */
   if (DECL_EXTERNAL (decl))
     return;