tree.c (free_lang_data_in_decl): Zero DECL_VINDEX if it's not an integer.

	* tree.c (free_lang_data_in_decl): Zero DECL_VINDEX if it's not
	an integer.
	* tree.h (tree_decl_non_common.vindex): Adjust comment.

From-SVN: r171904

3 files changed, 14 insertions, 1 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a4b56f2..4be06bf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-03  Michael Matz  <matz@suse.de>
 
+	* tree.c (free_lang_data_in_decl): Zero DECL_VINDEX if it's not
+	an integer.
+	* tree.h (tree_decl_non_common.vindex): Adjust comment.
+
+2011-04-03  Michael Matz  <matz@suse.de>
+
 	* cgraphbuild.c (record_reference): Canonicalize constructor
 	values.
 	* gimple-fold.c (canonicalize_constructor_val): Accept being called
diff --git a/gcc/tree.c b/gcc/tree.c
index eec4a8b..f1ac7a6 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4647,6 +4647,13 @@ free_lang_data_in_decl (tree decl)
 	  && RECORD_OR_UNION_TYPE_P
 	       (DECL_CONTEXT (DECL_ABSTRACT_ORIGIN (decl))))
 	DECL_ABSTRACT_ORIGIN (decl) = NULL_TREE;
+
+      /* Sometimes the C++ frontend doesn't manage to transform a temporary
+         DECL_VINDEX referring to itself into a vtable slot number as it
+	 should.  Happens with functions that are copied and then forgotten
+	 about.  Just clear it, it won't matter anymore.  */
+      if (DECL_VINDEX (decl) && !host_integerp (DECL_VINDEX (decl), 0))
+	DECL_VINDEX (decl) = NULL_TREE;
     }
   else if (TREE_CODE (decl) == VAR_DECL)
     {
diff --git a/gcc/tree.h b/gcc/tree.h
index b503361..053076f 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3229,7 +3229,7 @@ struct GTY(())
   tree arguments;
   /* Almost all FE's use this.  */
   tree result;
-  /* C++ uses this in namespaces.  */
+  /* C++ uses this in namespaces and function_decls.  */
   tree vindex;
 };