vec.cc (__aeabi_vec_dtor_cookie): Handle NULL array address.

2008-06-27  Mark Mitchell  <mark@codesourcery.com>

	* libsupc++/vec.cc (__aeabi_vec_dtor_cookie): Handle NULL array
	address.
	(__aeabi_vec_delete): Likewise.
	(__aeabi_vec_delete3): Likewise.
	(__aeabi_vec_delete3_nodtor): Likewise.

2008-06-27  Mark Mitchell  <mark@codesourcery.com>

	* g++.dg/abi/arm_cxa_vec2.C: New test.

From-SVN: r137207

gcc/testsuite/ChangeLog

+2008-06-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* g++.dg/abi/arm_cxa_vec2.C: New test.
+
 2008-06-28  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/36364

gcc/testsuite/g++.dg/abi/arm_cxa_vec2.C

+// Check that ARM vector delete functions accept NULL pointers as
+// inputs.
+// { dg-do run { target arm*-*-* } }
+
+#ifdef __ARM_EABI__
+#include <cxxabi.h>
+
+typedef void *(dtor_type)(void *);
+
+extern "C" {
+  void abort();
+  void *__aeabi_vec_dtor_cookie(void *, dtor_type);
+  void __aeabi_vec_delete(void *, dtor_type);
+  void __aeabi_vec_delete3(void *, 
+			   dtor_type, 
+			   void (*)(void *, __SIZE_TYPE__));
+  void __aeabi_vec_delete3_nodtor(void *, 
+				  void (*)(void *, __SIZE_TYPE__));
+}
+
+// These functions should never be called.
+void* dtor(void *)
+{
+  abort ();
+}
+
+void dealloc(void *, size_t) {
+  abort ();
+}
+
+int main () {
+  if (__aeabi_vec_dtor_cookie (NULL, &dtor) != NULL)
+    return 1;
+  // These do not return values, but should not crash.
+  __aeabi_vec_delete (NULL, &dtor);
+  __aeabi_vec_delete3 (NULL, &dtor, &dealloc);
+  __aeabi_vec_delete3_nodtor (NULL, &dealloc);
+}
+#else
+int main () {}
+#endif

libstdc++-v3/ChangeLog

+2008-06-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* libsupc++/vec.cc (__aeabi_vec_dtor_cookie): Handle NULL array
+	address.
+	(__aeabi_vec_delete): Likewise.
+	(__aeabi_vec_delete3): Likewise.
+	(__aeabi_vec_delete3_nodtor): Likewise.
+
 2008-06-27  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/stl_algo.h (is_partitioned): Add in C++0x mode.

libstdc++-v3/libsupc++/vec.cc

@@ -461,6 +461,9 @@ namespace __aeabiv1
   __aeabi_vec_dtor_cookie (void *array_address, 
 			   abi::__cxa_cdtor_type destructor)
   {
+    if (!array_address)
+      return NULL;
+
     abi::__cxa_vec_dtor (array_address, 
 			 reinterpret_cast<std::size_t *>(array_address)[-1],
 			 reinterpret_cast<std::size_t *>(array_address)[-2],
@@ -473,6 +476,9 @@ namespace __aeabiv1
   __aeabi_vec_delete (void *array_address, 
 		      abi::__cxa_cdtor_type destructor)
   {
+    if (!array_address)
+      return;
+
     abi::__cxa_vec_delete (array_address,
 			   reinterpret_cast<std::size_t *>(array_address)[-2],
 			   2 * sizeof (std::size_t),
@@ -484,6 +490,9 @@ namespace __aeabiv1
 		       abi::__cxa_cdtor_type destructor,
 		       void (*dealloc) (void *, std::size_t))
   {
+    if (!array_address)
+      return;
+
     abi::__cxa_vec_delete3 (array_address,
 			    reinterpret_cast<std::size_t *>(array_address)[-2],
 			    2 * sizeof (std::size_t),
@@ -494,6 +503,9 @@ namespace __aeabiv1
   __aeabi_vec_delete3_nodtor (void *array_address,
 			      void (*dealloc) (void *, std::size_t))
   {
+    if (!array_address)
+      return;
+
     abi::__cxa_vec_delete3 (array_address,
 			    reinterpret_cast<std::size_t *>(array_address)[-2],
 			    2 * sizeof (std::size_t),