ptrflags.C: New test.

	* g++.abi/ptrflags.C: New test.
	* g++.eh/catchptr1.C: Test incomplete pointer chains.

From-SVN: r33282

3 files changed, 105 insertions, 3 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 58dc414..1cda827 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-20  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* g++.abi/ptrflags.C: New test.
+	* g++.eh/catchptr1.C: Test incomplete pointer chains.
+
 2000-04-19  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* gcc.dg/20000419-1.c: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.abi/ptrflags.C b/gcc/testsuite/g++.old-deja/g++.abi/ptrflags.C
new file mode 100644
index 0000000..b258e08
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.abi/ptrflags.C
@@ -0,0 +1,62 @@
+// Test rtti pointer flags
+// Copyright (C) 2000 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 15 Apr 2000 <nathan@nathan@codesourcery.com>
+
+#include <typeinfo>
+
+#if defined (__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100
+#include <cxxabi.h>
+
+struct A {int m;};
+struct B;
+
+using namespace abi;
+
+int expect (int flags, type_info const &info)
+{
+  __pointer_class_type_info const *ptr =
+      dynamic_cast <__pointer_class_type_info const *> (&info);
+  if (!ptr)
+    return 0;
+  if (ptr->quals != flags)
+    return 0;
+  return 1;
+}
+
+int main ()
+{
+  if (! expect (0, typeid (A *)))
+    return 1;
+  if (! expect (1, typeid (A const *)))
+    return 2;
+  if (! expect (2, typeid (A volatile *)))
+    return 3;
+  if (! expect (4, typeid (A __restrict__ *)))
+    return 4;
+  if (! expect (0, typeid (void A::*))
+    return 5;
+  if (! expect (0, typeid (void A::**))
+    return 6;
+
+  if (! expect (8 | 0, typeid (B *)))
+    return 1;
+  if (! expect (8 | 1, typeid (B const *)))
+    return 2;
+  if (! expect (8 | 2, typeid (B volatile *)))
+    return 3;
+  if (! expect (8 | 4, typeid (B __restrict__ *)))
+    return 4;
+  if (! expect (8 | 0, typeid (void B::*))
+    return 5;
+  if (! expect (8 | 0, typeid (void B::**))
+    return 6;
+  
+  return 0;
+}
+
+#else
+int main ()
+{
+  return 0;
+}
+#endif
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/catchptr1.C b/gcc/testsuite/g++.old-deja/g++.eh/catchptr1.C
index 3c74b8d..c88b36a 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/catchptr1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/catchptr1.C
@@ -27,6 +27,7 @@ int test0 ()
     {
       return 0;
     }
+  return -1;
 }
 
 int test1 ()
@@ -44,6 +45,7 @@ int test1 ()
     {
       return 0;
     }
+  return -1;
 }
 
 int test2 ()
@@ -61,6 +63,7 @@ int test2 ()
     {
       return 1;
     }
+  return -1;
 }
 
 int test3 ()
@@ -78,6 +81,7 @@ int test3 ()
     {
       return 1;
     }
+  return -1;
 }
 
 int test4 ()
@@ -100,6 +104,7 @@ int test4 ()
     {
       return 2;
     }
+  return -1;
 }
 
 int test5 ()
@@ -116,6 +121,7 @@ int test5 ()
     {
       return 1;
     }
+  return -1;
 }
 
 int test6 ()
@@ -148,6 +154,7 @@ int test6 ()
     {
       return 1;
     }
+  return -1;
 }
 
 int test7 ()
@@ -172,11 +179,13 @@ int test7 ()
     {
       return 3;
     }
+  return -1;
 }
 
-#if 0
 int test8 ()
 {
+#if defined (__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100
+// old-abi fails this test, by segfaulting in the runtime.
   try
     {
       throw (B **)0;
@@ -193,8 +202,35 @@ int test8 ()
     {
       return 2;
     }
+  return -1;
+#endif
+  return 0;
 }
+
+int test9 ()
+{
+#if defined (__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100
+// old-abi fails this test, by segfaulting in the runtime.
+  try
+    {
+      throw (B **)0;
+    }
+  catch (C const *const *)
+    {
+      return 1;
+    }
+  catch (B const *const *)
+    {
+      return 0;
+    }
+  catch (...)
+    {
+      return 2;
+    }
+  return -1;
 #endif
+  return 0;
+}
 
 static int (*tests[])() =
 {
@@ -208,9 +244,8 @@ static int (*tests[])() =
   test6,
   test7,
   
-#if 0
   test8,
-#endif
+  test9,
   
   NULL
 };