s/abort/gdb_assert/

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cdaba47eed54b117758d1e67326d3b85409b1d37..0f27a908da315f23aa720ccb15dd8c16789682c4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-07  Andrew Cagney  <ac131313@redhat.com>
+
+       * gnu-v3-abi.c: Include "gdb_assert.h".
+       (build_gdb_vtable_type): Replace abort() with gdb_assert().
+
 2001-06-06  Jim Blandy  <jimb@redhat.com>
 
        * cp-abi.h: Rearrange code to put documentation comments above the

diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index 015bead1b8090625769b4fb22760b6b58f9727aa..d9da17c8b90458ff2a34efc056b3ddd6a929213d 100644 (file)
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -23,6 +23,7 @@
 #include "value.h"
 #include "cp-abi.h"
 #include "demangle.h"
+#include "gdb_assert.h"
 
 static struct cp_abi_ops gnu_v3_abi_ops;
 
@@ -156,8 +157,7 @@ build_gdb_vtable_type (struct gdbarch *arch)
   field++;
 
   /* We assumed in the allocation above that there were four fields.  */
-  if (field != field_list + 4)
-    abort ();
+  gdb_assert (field == (field_list + 4));
 
   t = init_type (TYPE_CODE_STRUCT, offset, 0, 0, 0);
   TYPE_NFIELDS (t) = field - field_list;