re PR c++/9433 (SegFault in dynamic_cast)

libstdc++-v3:
        PR c++/9433
        * libsupc++/tinfo.cc (__vmi_class_type_info::__do_dyncast): Cope
        with bases which are very ambiguous.
gcc/testsuite:
        * g++.dg/abi/dcast1.C: New test.

From-SVN: r61973

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 63d0d2982c62f144008ed53c635844d943be21e3..5523cebeb572a0f6cf8a7e87a10c95202c467215 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-28  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * g++.dg/abi/dcast1.C: New test.
+
 2003-01-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * gcc.c-torture/execute/builtin-constant.x: Only expect failure at -O1.

diff --git a/gcc/testsuite/g++.dg/abi/dcast1.C b/gcc/testsuite/g++.dg/abi/dcast1.C
new file mode 100644 (file)
index 0000000..402684f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/dcast1.C
@@ -0,0 +1,29 @@
+// { dg-do compile }
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 28 Jan 2003 <nathan@codesourcery.com>
+
+// PR 9433. segfault at runtime.
+
+struct A        { virtual void f() {}; };
+struct B        {int b;};
+struct C : A, B { virtual void f() {}; int c;};
+struct D : C    {int d;};
+struct E : C    {int e;};
+struct F : protected D, E  {int f;};
+struct H : virtual F {int h;};
+struct I : H  {int i;};
+struct J : H  {int j;};
+struct K : I, J { virtual void f() {}; int k; };
+struct M : K  {int m;};
+struct N : M  {int n;};
+struct O : M  {int o;};
+struct P : N, O { virtual void f() {}; int p;};
+
+int main()
+{
+  P obj;
+  A* a1 = (D *) (&obj);
+  H* hp = dynamic_cast<H*>(a1);
+  return hp != 0;
+}

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1241b209ab7d32233d7c6a9dce9aa6cef0141ab9..8f3c1bc99993f055879eae114a6b229aa0c4a732 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-28  Nathan Sidwell  <nathan@codesourcery.com>
+
+       PR c++/9433
+       * libsupc++/tinfo.cc (__vmi_class_type_info::__do_dyncast): Cope
+       with bases which are very ambiguous.
+
 2003-01-28  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * src/Makefile.am (CONFIG_CXXFLAGS): Reverse order of

diff --git a/libstdc++-v3/libsupc++/tinfo.cc b/libstdc++-v3/libsupc++/tinfo.cc
index 74d13834af4db61f920280b371aaf622158e5a7e..fe92ad7e7a2ab675d1a59716e466c14e2fb00bc1 100644 (file)
--- a/libstdc++-v3/libsupc++/tinfo.cc
+++ b/libstdc++-v3/libsupc++/tinfo.cc
@@ -1,5 +1,5 @@
 // Methods for type_info for -*- C++ -*- Run Time Type Identification.
-// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002
+// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003
 // Free Software Foundation
 //
 // This file is part of GNU CC.
@@ -482,8 +482,9 @@ __do_dyncast (ptrdiff_t src2dst,
           result.whole2dst =
               __sub_kind (result.whole2dst | result2.whole2dst);
         }
-      else if ((result.dst_ptr != 0 | result_ambig)
-               && (result2.dst_ptr != 0 | result2_ambig))
+      else if ((result.dst_ptr != 0 & result2.dst_ptr != 0)
+              || (result.dst_ptr != 0 & result2_ambig)
+              || (result2.dst_ptr != 0 & result_ambig))
         {
           // Found two different DST_TYPE bases, or a valid one and a set of
           // ambiguous ones, must disambiguate. See whether SRC_PTR is