From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 2 Oct 2018 10:08:22 +0000 (+0000)
Subject: 2018-10-02  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac22ae8146ef3a8316c6eca7700a0c73edb9966a;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@264779 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index a8e235c9f9b5..720aadcd0eac 100644
--- 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 fdcfbde2d993..160ce357cb16 100644
--- 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 e10ada2d7b67..fd0fb8a720a3 100644
--- 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 95d2845dd911..08632c382b7b 100644
--- 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;