From ee7a8a430465b87e4f17dfd58e4be875d323dba8 Mon Sep 17 00:00:00 2001
From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 24 May 2010 17:41:47 +0000
Subject: [PATCH] 2010-05-24  Richard Guenther  <rguenther@suse.de>

	PR lto/44196
	* tree.c (find_decls_types_r): Walk BLOCKs and its vars.

	* g++.dg/lto/20100519-1_0.C: New testcase.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@159789 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                           |  5 +++++
 gcc/testsuite/ChangeLog                 |  5 +++++
 gcc/testsuite/g++.dg/lto/20100519-1_0.C | 23 +++++++++++++++++++++++
 gcc/tree.c                              |  9 +++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/lto/20100519-1_0.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4c954acfe9..200d44a1191 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-24  Richard Guenther  <rguenther@suse.de>
+
+	PR lto/44196
+	* tree.c (find_decls_types_r): Walk BLOCKs and its vars.
+
 2010-05-24  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backport from mainline:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3b041464102..06940c5bd74 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2010-05-24  Richard Guenther  <rguenther@suse.de>
 
+	PR lto/44196
+	* g++.dg/lto/20100519-1_0.C: New testcase.
+
+2010-05-24  Richard Guenther  <rguenther@suse.de>
+
 	PR lto/44256
 	* gcc.dg/lto/20100426_0.c: New testcase.
 
diff --git a/gcc/testsuite/g++.dg/lto/20100519-1_0.C b/gcc/testsuite/g++.dg/lto/20100519-1_0.C
new file mode 100644
index 00000000000..bc2ddf140d1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lto/20100519-1_0.C
@@ -0,0 +1,23 @@
+// { dg-lto-do link }
+
+template <typename Ordinal>
+struct DirectSerializationTraits
+{
+  static void fromCountToDirectBytes(const Ordinal count) {}
+};
+template<typename Ordinal> class SerializationTraits
+  : public DirectSerializationTraits<Ordinal> { };
+template <typename Ordinal>
+class ConstValueTypeSerializationBuffer
+{
+public:
+    ConstValueTypeSerializationBuffer(const Ordinal count)
+      {
+	typedef SerializationTraits<Ordinal> SerT;
+	SerT::fromCountToDirectBytes(count);
+      }
+};
+int main ()
+{
+  ConstValueTypeSerializationBuffer<int> charSendBuffer(1);
+}
diff --git a/gcc/tree.c b/gcc/tree.c
index ad0b7a72579..b503f753a78 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4677,6 +4677,15 @@ find_decls_types_r (tree *tp, int *ws, void *data)
       fld_worklist_push (TREE_CHAIN (t), fld);
       *ws = 0;
     }
+  else if (TREE_CODE (t) == BLOCK)
+    {
+      tree tem;
+      for (tem = BLOCK_VARS (t); tem; tem = TREE_CHAIN (tem))
+	fld_worklist_push (tem, fld);
+      for (tem = BLOCK_SUBBLOCKS (t); tem; tem = BLOCK_CHAIN (tem))
+	fld_worklist_push (tem, fld);
+      fld_worklist_push (BLOCK_ABSTRACT_ORIGIN (t), fld);
+    }
 
   fld_worklist_push (TREE_TYPE (t), fld);
 
-- 
2.11.4.GIT