From cef8c10098ffd48dec16db4a8a67e1cd542a1163 Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Wed, 4 Jul 2012 10:36:07 +0000
Subject: [PATCH] tree.c (find_decls_types_r): Handle TYPE_CONTEXT the same as
in free_lang_data_in_type.
2012-07-04 Richard Guenther <rguenther@suse.de>
* tree.c (find_decls_types_r): Handle TYPE_CONTEXT the same
as in free_lang_data_in_type.
From-SVN: r189252
---
gcc/ChangeLog | 5 +++++
gcc/tree.c | 10 +++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb615906ea52..ef3b9c40455d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-04 Richard Guenther <rguenther@suse.de>
+
+ * tree.c (find_decls_types_r): Handle TYPE_CONTEXT the same
+ as in free_lang_data_in_type.
+
2012-07-04 Tobias Grosser <tobias@grosser.es>
Michael Matz <matz@suse.de>
diff --git a/gcc/tree.c b/gcc/tree.c
index f9942fb04874..9be0c9a7e315 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4910,7 +4910,15 @@ find_decls_types_r (tree *tp, int *ws, void *data)
fld_worklist_push (TYPE_MAIN_VARIANT (t), fld);
/* Do not walk TYPE_NEXT_VARIANT. We do not stream it and thus
do not and want not to reach unused variants this way. */
- fld_worklist_push (TYPE_CONTEXT (t), fld);
+ if (TYPE_CONTEXT (t))
+ {
+ tree ctx = TYPE_CONTEXT (t);
+ /* We adjust BLOCK TYPE_CONTEXTs to the innermost non-BLOCK one.
+ So push that instead. */
+ while (ctx && TREE_CODE (ctx) == BLOCK)
+ ctx = BLOCK_SUPERCONTEXT (ctx);
+ fld_worklist_push (ctx, fld);
+ }
/* Do not walk TYPE_CANONICAL. We do not stream it and thus do not
and want not to reach unused types this way. */
--
GitLab