Re: testsuite results 971201

[Manfred dot Hollstein at ks dot sel dot alcatel dot de]

On Tue, 2 December 1997, 15:07:44, schmid@ltoi.iap.physik.tu-darmstadt.de wrote:

 > /home/schmid/ftp/egcs-971201/gcc/testsuite/g++.old-deja/g++.jason/destruct3.C:
 > 35:Internal compiler error 369.
 > /home/schmid/ftp/egcs-971201/gcc/testsuite/g++.old-deja/g++.jason/destruct3.C:
 > 35: Please submit a full bug report to `egcs-bugs@cygnus.com'.
 > Are you going to fix this?
 > At least the compiler should not crash.
 > 

This one has been fixed for me by Mike Stump's patch:

On Thu, 6 November 1997, 15:37:39, mrs@wrs.com wrote:

    This fixes up my previous patch to handle an additional case, so that
    we are almost never limited in complex MI cases for vtable names.
    This preserves backwards compatibility.

    Let me know when it goes in, thanks.

    See g++.jason/destruct3.C for testcase.

        sethi %hi(_vt.8ccVSTool.8ccUnwind),%o1
        or %o1,%lo(_vt.8ccVSTool.8ccUnwind),%o0
        st %o0,[%l0+4]
        sethi %hi(_vt.8ccVSTool.8ccUnwind.2),%o1
        or %o1,%lo(_vt.8ccVSTool.8ccUnwind.2),%o0
        st %o0,[%l0+8]
        sethi %hi(_vt.8ccVSTool),%o1
        or %o1,%lo(_vt.8ccVSTool),%o0


1997-11-06  Mike Stump  <mrs@wrs.com>

	* class.c (prepare_fresh_vtable): Enable even more complex MI
	vtable names.

Doing diffs in cp:
*** cp/class.c.~1~	Fri Oct 31 14:10:08 1997
--- cp/class.c	Thu Nov  6 15:13:21 1997
*************** prepare_fresh_vtable (binfo, for_type)
*** 788,794 ****
  
    while (1)
      {
!       char *buf1 = (char *) alloca (TYPE_ASSEMBLER_NAME_LENGTH (for_type) + 1 + i);
        char *new_buf2;
  
        sprintf (buf1, "%s%c%s", TYPE_ASSEMBLER_NAME_STRING (for_type), joiner,
--- 788,795 ----
  
    while (1)
      {
!       char *buf1 = (char *) alloca (TYPE_ASSEMBLER_NAME_LENGTH (for_type)
! 				    + 1 + i);
        char *new_buf2;
  
        sprintf (buf1, "%s%c%s", TYPE_ASSEMBLER_NAME_STRING (for_type), joiner,
*************** prepare_fresh_vtable (binfo, for_type)
*** 812,819 ****
  
        basetype = TYPE_MAIN_VARIANT (BINFO_TYPE (path));
  
!       /* We better not run out of stuff to make it unique.  */
!       my_friendly_assert (for_type != basetype, 369);
  
        i = TYPE_ASSEMBLER_NAME_LENGTH (basetype) + 1 + i;
        new_buf2 = (char *) alloca (i);
--- 813,846 ----
  
        basetype = TYPE_MAIN_VARIANT (BINFO_TYPE (path));
  
!       if (for_type == basetype)
! 	{
! 	  /* If we run out of basetypes in the path, we have already
! 	     found created a vtable with that name before, we now
! 	     resort to tacking on _%d to distinguish them.  */
! 	  int j = 2;
! 	  i = TYPE_ASSEMBLER_NAME_LENGTH (basetype) + 1 + i + 1 + 3;
! 	  buf1 = (char *) alloca (i);
! 	  do {
! 	    sprintf (buf1, "%s%c%s%c%d",
! 		     TYPE_ASSEMBLER_NAME_STRING (basetype), joiner,
! 		     buf2, joiner, j);
! 	    buf = (char *) alloca (strlen (VTABLE_NAME_FORMAT)
! 				   + strlen (buf1) + 1);
! 	    sprintf (buf, VTABLE_NAME_FORMAT, buf1);
! 	    name = get_identifier (buf);
! 
! 	    /* If this name doesn't clash, then we can use it,
! 	       otherwise we add something different to the name until
! 	       it is unique.  */
! 	  } while (++j <= 999 && IDENTIFIER_GLOBAL_VALUE (name));
! 
! 	  /* Hey, they really like MI don't they?  Increase the 3
!              above to 6, and the 999 to 999999.  :-)  */
! 	  my_friendly_assert (j <= 999, 369);
! 
! 	  break;
! 	}
  
        i = TYPE_ASSEMBLER_NAME_LENGTH (basetype) + 1 + i;
        new_buf2 = (char *) alloca (i);
--------------
Doing diffs in testsuite:
*** testsuite/g++.old-deja/g++.jason/destruct3.C.~1~	Mon Aug 25 08:35:39 1997
--- testsuite/g++.old-deja/g++.jason/destruct3.C	Thu Nov  6 15:31:08 1997
***************
*** 1,3 ****
--- 1,4 ----
+ // Special g++ Options: -w
  // PRMS Id: 4342 (second testcase)
  // Bug: g++ still can't deal with ambiguous inheritance in destructor calls.
  // Build don't link:
*************** struct ccScreenObj : public ccScreenObjR
*** 32,41 ****
  {};
  
  struct ccVSTool : public ccImpExp, public ccUnwind 
! {};	// gets bogus error - XFAIL *-*-*
  
  struct ccSCCP : public ccVSTool
! {};	// gets bogus error - XFAIL *-*-*
  
  void foo ()
  {
--- 33,42 ----
  {};
  
  struct ccVSTool : public ccImpExp, public ccUnwind 
! {};
  
  struct ccSCCP : public ccVSTool
! {};
  
  void foo ()
  {