ooo-build r11315 - trunk/patches/test

[michael svn gnome org]

Author: michael
Date: Fri Jan 18 10:24:14 2008
New Revision: 11315
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11315&view=rev

Log:
upd


Modified:
   trunk/patches/test/gcc-vt-copy-3.diff

Modified: trunk/patches/test/gcc-vt-copy-3.diff
==============================================================================
--- trunk/patches/test/gcc-vt-copy-3.diff	(original)
+++ trunk/patches/test/gcc-vt-copy-3.diff	Fri Jan 18 10:24:14 2008
@@ -838,36 +838,42 @@
  
 diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' pristine-gcc-4.2.1-simple/gcc/cp/mangle.c gcc-4.2.1-simple/gcc/cp/mangle.c
 --- pristine-gcc-4.2.1-simple/gcc/cp/mangle.c	2006-12-11 12:16:19.000000000 +0000
-+++ gcc-4.2.1-simple/gcc/cp/mangle.c	2008-01-17 14:59:24.000000000 +0000
-@@ -2670,6 +2670,71 @@
++++ gcc-4.2.1-simple/gcc/cp/mangle.c	2008-01-18 10:06:08.000000000 +0000
+@@ -2670,6 +2670,77 @@
    return mangle_special_for_type (type, "TV");
  }
  
++/* FIXME: as should be obvious I have no idea what I'm doing here */
++static int calc_max_depth (const tree binfo)
++{
++  int i, max = 0;
++  tree base;
++
++  for (i = 0; BINFO_BASE_ITERATE (binfo, i, base); ++i) {
++    int depth = calc_max_depth (base);
++    if (depth > max)
++      max = depth;
++  }
++  return max + 1;
++}
++
 +static void write_order_complexity_for_type (const tree type)
 +{
 +  int max_depth = 0;
 +  int i, virts;
-+  tree binfo, base_binfo, vbase, p;
++  tree binfo, vbase, p;
 +  char buffer[128]; /* hack */
 +
 +  binfo = TYPE_BINFO (type);
 +
-+  /* FIXME: as should be obvious I have no idea what I'm doing here */
-+  for (i = 0; BINFO_BASE_ITERATE (binfo, i, base_binfo); ++i)
-+    ;
-+  if (i > max_depth)
-+    max_depth = i;
-+
-+  i = 0;
-+  for (p = binfo; p; p = BINFO_INHERITANCE_CHAIN (p))
-+    i++;
-+  if (i > max_depth)
-+    max_depth = i;
++  max_depth = calc_max_depth (binfo);
 +
-+  /* Then come the virtual bases, also in inheritance graph order.  */
-+  virts = 0;
++#if 0
++  /* FIXME: virtual bases ? */
 +  for (vbase = binfo; vbase; vbase = TREE_CHAIN (vbase))
-+    virts++;
++    virts++; 
++#endif
++  virts = 0;
 +
 +  sprintf (buffer, "_%.8i_", max_depth + virts);
 +  write_string (buffer);