* dwarf2out.c (set_block_origin_self): Skip nested functions.

From-SVN: r218133

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05547424d8dc0626f2d24c0f1859ca09e37bf174..4b3248fb5268276fae8c7a266e5d9ba2834ad350 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * dwarf2out.c (set_block_origin_self): Skip nested functions.
+
 2014-11-27  H.J. Lu  <hongjiu.lu@intel.com>
 
         PR target/63833

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 25f0e7d3e26fa19ca06195638193b7b84921ad48..b7f93f080fcea88512dc9223f03a8d82f9fac71d 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -17940,8 +17940,11 @@ set_block_origin_self (tree stmt)
        for (local_decl = BLOCK_VARS (stmt);
             local_decl != NULL_TREE;
             local_decl = DECL_CHAIN (local_decl))
-         if (! DECL_EXTERNAL (local_decl))
-           set_decl_origin_self (local_decl);  /* Potential recursion.  */
+         /* Do not recurse on nested functions since the inlining status
+            of parent and child can be different as per the DWARF spec.  */
+         if (TREE_CODE (local_decl) != FUNCTION_DECL
+             && !DECL_EXTERNAL (local_decl))
+           set_decl_origin_self (local_decl);
       }
 
       {