re PR c++/5118 (c4x-g++ Fails on Templates)

        PR c++/5118
        * class.c (get_vfield_name): Use the constructor_name.

From-SVN: r51075

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7dd27a413ffd2d9e89c58c271050fad2bccbf2f5..38ce231d87fb9ea7f6fca82b90aeafb1ee8a1c6e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19  Jason Merrill  <jason@redhat.com>
+
+       PR c++/5118
+       * class.c (get_vfield_name): Use the constructor_name.
+
 2002-03-20  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * cp-lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 1c0c526ecb82df46705e153fb141472d69561696..cd23a0e31751a19a77ffb6d01281777af8cecb75 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -6332,7 +6332,8 @@ get_vfield_name (type)
   type = BINFO_TYPE (binfo);
   buf = (char *) alloca (sizeof (VFIELD_NAME_FORMAT)
                         + TYPE_NAME_LENGTH (type) + 2);
-  sprintf (buf, VFIELD_NAME_FORMAT, TYPE_NAME_STRING (type));
+  sprintf (buf, VFIELD_NAME_FORMAT,
+          IDENTIFIER_POINTER (constructor_name (type)));
   return get_identifier (buf);
 }