summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/call.c18
-rw-r--r--gcc/cp/class.c18
-rw-r--r--gcc/cp/decl.c38
-rw-r--r--gcc/cp/decl2.c14
-rw-r--r--gcc/cp/error.c8
-rw-r--r--gcc/cp/expr.c4
-rw-r--r--gcc/cp/friend.c2
-rw-r--r--gcc/cp/init.c10
-rw-r--r--gcc/cp/lex.c8
-rw-r--r--gcc/cp/mangle.c26
-rw-r--r--gcc/cp/method.c4
-rw-r--r--gcc/cp/pt.c32
-rw-r--r--gcc/cp/repo.c4
-rw-r--r--gcc/cp/rtti.c2
-rw-r--r--gcc/cp/search.c2
-rw-r--r--gcc/cp/semantics.c2
-rw-r--r--gcc/cp/spew.c4
-rw-r--r--gcc/cp/tree.c10
-rw-r--r--gcc/cp/typeck.c16
-rw-r--r--gcc/cp/typeck2.c6
-rw-r--r--gcc/cp/xref.c2
22 files changed, 122 insertions, 115 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1d8108b4309..9c6fce3862a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
+
+ * call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
+ init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
+ semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
+ Change my_fancy_abort() to abort().
+
2002-01-23 Jason Merrill <jason@redhat.com>
PR c++/5453
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 0b8ec03375e..cf6f0b42104 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -206,7 +206,7 @@ check_dtor_name (basetype, name)
else if (DECL_CLASS_TEMPLATE_P (name))
return 0;
else
- my_friendly_abort (980605);
+ abort ();
if (name && TYPE_MAIN_VARIANT (basetype) == TYPE_MAIN_VARIANT (name))
return 1;
@@ -423,7 +423,7 @@ build_call (function, parms)
|| !strncmp (IDENTIFIER_POINTER (DECL_NAME (decl)), "__", 2))
mark_used (decl);
else
- my_friendly_abort (990125);
+ abort ();
}
/* Don't pass empty class objects by value. This is useful
@@ -1932,7 +1932,7 @@ add_builtin_candidate (candidates, code, code2, fnname, type1, type2,
return candidates;
default:
- my_friendly_abort (367);
+ abort ();
}
type1 = build_reference_type (type1);
break;
@@ -1976,7 +1976,7 @@ add_builtin_candidate (candidates, code, code2, fnname, type1, type2,
return candidates;
default:
- my_friendly_abort (367);
+ abort ();
}
/* If we're dealing with two pointer types or two enumeral types,
@@ -3260,7 +3260,7 @@ build_new_op (code, flags, arg1, arg2, arg3)
case VEC_DELETE_EXPR:
case DELETE_EXPR:
/* Use build_op_new_call and build_op_delete_call instead. */
- my_friendly_abort (981018);
+ abort ();
case CALL_EXPR:
return build_object_call (arg1, arg2);
@@ -3565,7 +3565,7 @@ builtin:
return NULL_TREE;
default:
- my_friendly_abort (367);
+ abort ();
return NULL_TREE;
}
}
@@ -4447,7 +4447,7 @@ in_charge_arg_for_name (name)
/* This function should only be called with one of the names listed
above. */
- my_friendly_abort (20000411);
+ abort ();
return NULL_TREE;
}
@@ -5152,7 +5152,7 @@ source_type (t)
|| TREE_CODE (t) == IDENTITY_CONV)
return TREE_TYPE (t);
}
- my_friendly_abort (1823);
+ abort ();
}
/* Note a warning about preferring WINNER to LOSER. We do this by storing
@@ -5236,7 +5236,7 @@ joust (cand1, cand2, warn)
--len;
}
else
- my_friendly_abort (42);
+ abort ();
}
for (i = 0; i < len; ++i)
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index a97dd0ee92c..aa83b8df7bb 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5044,7 +5044,7 @@ finish_struct_1 (t)
if (IS_AGGR_TYPE (t))
error ("redefinition of `%#T'", t);
else
- my_friendly_abort (172);
+ abort ();
popclass ();
return;
}
@@ -6090,7 +6090,7 @@ instantiate_type (lhstype, rhs, flags)
case SAVE_EXPR:
case CONSTRUCTOR:
case BUFFER_REF:
- my_friendly_abort (177);
+ abort ();
return error_mark_node;
case INDIRECT_REF:
@@ -6159,7 +6159,7 @@ instantiate_type (lhstype, rhs, flags)
case CALL_EXPR:
/* This is too hard for now. */
- my_friendly_abort (183);
+ abort ();
return error_mark_node;
case PLUS_EXPR:
@@ -6266,14 +6266,14 @@ instantiate_type (lhstype, rhs, flags)
return instantiate_type (lhstype, TREE_OPERAND (rhs, 0), flags);
}
case ENTRY_VALUE_EXPR:
- my_friendly_abort (184);
+ abort ();
return error_mark_node;
case ERROR_MARK:
return error_mark_node;
default:
- my_friendly_abort (185);
+ abort ();
return error_mark_node;
}
}
@@ -6386,7 +6386,7 @@ get_enclosing_class (type)
break;
default:
- my_friendly_abort (0);
+ abort ();
}
}
return NULL_TREE;
@@ -6550,7 +6550,7 @@ get_primary_binfo (binfo)
}
/* We should always find the primary base. */
- my_friendly_abort (20000729);
+ abort ();
}
/* For a primary virtual base, we have to scan the entire hierarchy
@@ -6960,7 +6960,7 @@ get_original_base (base_binfo, binfo)
if (same_type_p (BINFO_TYPE (base_binfo),
BINFO_TYPE (BINFO_BASETYPE (derived, ix))))
return BINFO_BASETYPE (derived, ix);
- my_friendly_abort (20010223);
+ abort ();
return NULL;
}
@@ -7718,7 +7718,7 @@ build_vbase_offset_vtbl_entries (binfo, vid)
/* The vbase offset had better be the same. */
if (!tree_int_cst_equal (delta,
BINFO_VPTR_FIELD (orig_vbase)))
- my_friendly_abort (20000403);
+ abort ();
}
/* The next vbase will come at a more negative offset. */
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index fe3e24d0b64..3747cabe9e3 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -547,7 +547,7 @@ pop_binding_level ()
{
/* Cannot pop a level, if there are none left to pop. */
if (current_binding_level == global_binding_level)
- my_friendly_abort (123);
+ abort ();
}
/* Pop the current level, and free the structure for reuse. */
#if defined(DEBUG_CP_BINDING_LEVELS)
@@ -586,7 +586,7 @@ suspend_binding_level ()
{
/* Cannot suspend a level, if there are none left to suspend. */
if (current_binding_level == global_binding_level)
- my_friendly_abort (123);
+ abort ();
}
/* Suspend the current level. */
#if defined(DEBUG_CP_BINDING_LEVELS)
@@ -887,7 +887,7 @@ begin_scope (sk)
break;
default:
- my_friendly_abort (20000309);
+ abort ();
}
}
@@ -1187,7 +1187,7 @@ pop_binding (id, decl)
else if (BINDING_TYPE (binding) == decl)
BINDING_TYPE (binding) = NULL_TREE;
else
- my_friendly_abort (0);
+ abort ();
if (!BINDING_VALUE (binding) && !BINDING_TYPE (binding))
{
@@ -1491,7 +1491,7 @@ poplevel (keep, reverse, functionbody)
else if (TREE_CODE (decl) == OVERLOAD)
pop_binding (DECL_NAME (OVL_FUNCTION (decl)), decl);
else
- my_friendly_abort (0);
+ abort ();
}
}
@@ -4677,7 +4677,7 @@ push_overloaded_decl (decl, flags)
}
/* We should always find a previous binding in this case. */
- my_friendly_abort (0);
+ abort ();
}
/* Install the new binding. */
@@ -5662,7 +5662,7 @@ make_typename_type (context, name, complain)
return error_mark_node;
}
if (TREE_CODE (name) != IDENTIFIER_NODE)
- my_friendly_abort (2000);
+ abort ();
if (TREE_CODE (context) == NAMESPACE_DECL)
{
@@ -5743,7 +5743,7 @@ make_unbound_class_template (context, name, complain)
else if (DECL_P (name))
name = DECL_NAME (name);
if (TREE_CODE (name) != IDENTIFIER_NODE)
- my_friendly_abort (20010902);
+ abort ();
if (!uses_template_parms (context)
|| currently_open_class (context))
@@ -9534,7 +9534,7 @@ check_special_function_return_type (sfk, type, optype)
break;
default:
- my_friendly_abort (20000408);
+ abort ();
break;
}
@@ -10923,7 +10923,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
TREE_COMPLEXITY (declarator) = current_class_depth;
}
else
- my_friendly_abort (16);
+ abort ();
if (TREE_OPERAND (declarator, 0) == NULL_TREE)
{
@@ -11016,7 +11016,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
declarator = sname;
}
else if (TREE_CODE (sname) == SCOPE_REF)
- my_friendly_abort (17);
+ abort ();
else
{
done_scoping:
@@ -11051,7 +11051,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
break;
default:
- my_friendly_abort (158);
+ abort ();
}
}
@@ -11128,7 +11128,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
}
else
/* Unexpected declarator format. */
- my_friendly_abort (990210);
+ abort ();
/* If this is declaring a typedef name, return a TYPE_DECL. */
@@ -11352,7 +11352,7 @@ friend declaration requires class-key, i.e. `friend %#T'",
else if (TREE_CODE (declarator) == IDENTIFIER_NODE)
{
if (IDENTIFIER_OPNAME_P (declarator))
- my_friendly_abort (356);
+ abort ();
else
error ("variable or field `%s' declared void", name);
}
@@ -12322,7 +12322,7 @@ grok_op_properties (decl, friendp)
#include "operators.def"
#undef DEF_OPERATOR
- my_friendly_abort (20000527);
+ abort ();
}
while (0);
my_friendly_assert (operator_code != LAST_CPLUS_TREE_CODE, 20000526);
@@ -12495,7 +12495,7 @@ grok_op_properties (decl, friendp)
break;
default:
- my_friendly_abort (20000527);
+ abort ();
}
SET_OVERLOADED_OPERATOR_CODE (decl, operator_code);
@@ -12623,7 +12623,7 @@ tag_name (code)
case enum_type:
return "enum";
default:
- my_friendly_abort (981122);
+ abort ();
}
}
@@ -12675,7 +12675,7 @@ xref_tag (code_type_node, name, globalize)
code = ENUMERAL_TYPE;
break;
default:
- my_friendly_abort (18);
+ abort ();
}
/* If a cross reference is requested, look up the type
@@ -14168,7 +14168,7 @@ finish_function (flags)
have declarations (from inline functions) that need to go into
this function's blocks. */
if (current_binding_level->parm_flag != 1)
- my_friendly_abort (122);
+ abort ();
poplevel (1, 0, 1);
/* Set up the named return value optimization, if we can. Here, we
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1c7b579a9ec..67559b92299 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1653,7 +1653,7 @@ grokfield (declarator, declspecs, init, asmspec_tree, attrlist)
DECL_IN_AGGR_P (value) = 1;
return value;
}
- my_friendly_abort (21);
+ abort ();
/* NOTREACHED */
return NULL_TREE;
}
@@ -2383,7 +2383,7 @@ output_vtable_inherit (vars)
parent_rtx = XEXP (DECL_RTL (parent), 0); /* strip the mem ref */
}
else
- my_friendly_abort (980826);
+ abort ();
assemble_vtable_inherit (child_rtx, parent_rtx);
}
@@ -2833,7 +2833,7 @@ start_static_storage_duration_function ()
/* Overflow occurred. That means there are at least 4 billion
initialization functions. */
sorry ("too many initialization functions required");
- my_friendly_abort (19990430);
+ abort ();
}
/* Create the parameters. */
@@ -3804,7 +3804,7 @@ build_expr_from_tree (t)
return build_x_compound_expr
(build_expr_from_tree (TREE_OPERAND (t, 0)));
else
- my_friendly_abort (42);
+ abort ();
case METHOD_CALL_EXPR:
if (TREE_CODE (TREE_OPERAND (t, 0)) == SCOPE_REF)
@@ -4022,7 +4022,7 @@ finish_decl_parsing (decl)
case TEMPLATE_ID_EXPR:
return decl;
default:
- my_friendly_abort (5);
+ abort ();
return NULL_TREE;
}
}
@@ -4670,7 +4670,7 @@ arg_assoc_type (k, type)
return 0;
/* else fall through */
default:
- my_friendly_abort (390);
+ abort ();
}
return 0;
}
@@ -4865,7 +4865,7 @@ validate_nonmember_using_decl (decl, scope, name)
return NULL_TREE;
}
else
- my_friendly_abort (382);
+ abort ();
if (DECL_P (*name))
*name = DECL_NAME (*name);
/* Make a USING_DECL. */
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index de6221507eb..4642fcd1829 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -803,7 +803,7 @@ dump_global_iord (t)
else if (DECL_GLOBAL_DTOR_P (t))
p = "destructors";
else
- my_friendly_abort (352);
+ abort ();
output_printf (scratch_buffer, "(static %s for %s)", p, input_filename);
}
@@ -910,7 +910,7 @@ dump_decl (t, flags)
break;
case TYPE_EXPR:
- my_friendly_abort (69);
+ abort ();
break;
/* These special cases are duplicated here so that other functions
@@ -1050,7 +1050,7 @@ dump_template_decl (t, flags)
else if (TREE_CODE (DECL_TEMPLATE_RESULT (t)) == VAR_DECL)
dump_decl (DECL_TEMPLATE_RESULT (t), flags | TFF_TEMPLATE_NAME);
else if (TREE_TYPE (t) == NULL_TREE)
- my_friendly_abort (353);
+ abort ();
else
switch (NEXT_CODE (t))
{
@@ -2272,7 +2272,7 @@ language_to_string (c, v)
return "Java";
default:
- my_friendly_abort (355);
+ abort ();
return 0;
}
}
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 57099dcde3f..34f779ebb97 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -106,7 +106,7 @@ cplus_expand_expr (exp, target, tmode, modifier)
case OFFSET_REF:
/* Offset refs should not make it through to here. */
- my_friendly_abort (20010724);
+ abort ();
return const0_rtx;
case THROW_EXPR:
@@ -126,7 +126,7 @@ cplus_expand_expr (exp, target, tmode, modifier)
default:
return c_expand_expr (exp, target, tmode, modifier);
}
- my_friendly_abort (40);
+ abort ();
/* NOTREACHED */
return NULL;
}
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index c43e0348d29..1d9670133a6 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -323,7 +323,7 @@ do_friend (ctype, declarator, decl, parmdecls, attrlist,
}
if (TREE_CODE (decl) != FUNCTION_DECL)
- my_friendly_abort (990513);
+ abort ();
is_friend_template = PROCESSING_REAL_TEMPLATE_DECL_P ();
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 4dd0f9d8ed1..017b8943906 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1737,7 +1737,7 @@ build_offset_ref (type, name)
/* static class functions too. */
if (TREE_CODE (t) == FUNCTION_DECL
&& TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
- my_friendly_abort (53);
+ abort ();
/* In member functions, the form `type::name' is no longer
equivalent to `this->type::name', at least not until
@@ -1887,7 +1887,7 @@ resolve_offset_ref (exp)
{
return get_member_function_from_ptrfunc (&addr, member);
}
- my_friendly_abort (56);
+ abort ();
/* NOTREACHED */
return NULL_TREE;
}
@@ -1976,7 +1976,7 @@ build_new (placement, decl, init, use_global_new)
nelts = integer_one_node;
if (absdcl && TREE_CODE (absdcl) == CALL_EXPR)
- my_friendly_abort (215);
+ abort ();
while (absdcl && TREE_CODE (absdcl) == INDIRECT_REF)
{
last_absdcl = absdcl;
@@ -2952,7 +2952,7 @@ build_vec_init (base, init, from_array)
else if (from)
elt_init = build_modify_expr (to, NOP_EXPR, from);
else
- my_friendly_abort (57);
+ abort ();
}
else if (TREE_CODE (type) == ARRAY_TYPE)
{
@@ -3075,7 +3075,7 @@ build_dtor_call (exp, dtor_kind, flags)
break;
default:
- my_friendly_abort (20000524);
+ abort ();
}
return build_method_call (exp, name, NULL_TREE, NULL_TREE, flags);
}
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index a6d983a1012..b30c8171675 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -780,7 +780,7 @@ yyprint (file, yychar, yylval)
else if (yylval.ttype == enum_type_node)
fprintf (file, " `enum'");
else
- my_friendly_abort (80);
+ abort ();
break;
case CONSTANT:
@@ -1012,7 +1012,7 @@ note_got_semicolon (type)
tree type;
{
if (!TYPE_P (type))
- my_friendly_abort (60);
+ abort ();
if (CLASS_TYPE_P (type))
CLASSTYPE_GOT_SEMICOLON (type) = 1;
}
@@ -1514,7 +1514,7 @@ retrofit_lang_decl (t)
SET_DECL_LANGUAGE (t, lang_c);
else if (current_lang_name == lang_name_java)
SET_DECL_LANGUAGE (t, lang_java);
- else my_friendly_abort (64);
+ else abort ();
#ifdef GATHER_STATISTICS
tree_node_counts[(int)lang_decl] += 1;
@@ -1687,6 +1687,6 @@ cp_type_qual_from_rid (rid)
else if (rid == ridpointers[(int) RID_RESTRICT])
return TYPE_QUAL_RESTRICT;
- my_friendly_abort (0);
+ abort ();
return TYPE_UNQUALIFIED;
}
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 63f3a0461ad..8a230d2566b 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -361,7 +361,7 @@ add_substitution (node)
|| (TYPE_P (node)
&& TYPE_P (candidate)
&& same_type_p (node, candidate)))
- my_friendly_abort (20000524);
+ abort ();
}
}
#endif /* ENABLE_CHECKING */
@@ -779,7 +779,7 @@ write_unscoped_name (decl)
|| TREE_CODE (context) == FUNCTION_DECL)
write_unqualified_name (decl);
else
- my_friendly_abort (20000521);
+ abort ();
}
/* <unscoped-template-name> ::= <unscoped-name>
@@ -923,7 +923,7 @@ write_template_prefix (node)
template = CLASSTYPE_TI_TEMPLATE (type);
else
/* Oops, not a template. */
- my_friendly_abort (20000524);
+ abort ();
/* For a member template, though, the template name for the
innermost name must have all the outer template levels
@@ -1185,7 +1185,7 @@ write_special_name_constructor (ctor)
else if (DECL_BASE_CONSTRUCTOR_P (ctor))
write_string ("C2");
else
- my_friendly_abort (20001115);
+ abort ();
}
/* Handle destructor productions of non-terminal <special-name>.
@@ -1214,7 +1214,7 @@ write_special_name_destructor (dtor)
else if (DECL_BASE_DESTRUCTOR_P (dtor))
write_string ("D2");
else
- my_friendly_abort (20001115);
+ abort ();
}
/* Return the discriminator for ENTITY appearing inside
@@ -1445,7 +1445,7 @@ write_type (type)
break;
default:
- my_friendly_abort (20000409);
+ abort ();
}
}
@@ -1558,7 +1558,7 @@ write_builtin_type (type)
tree t = type_for_mode (TYPE_MODE (type), TREE_UNSIGNED (type));
if (type == t)
/* Couldn't find this type. */
- my_friendly_abort (20000408);
+ abort ();
type = t;
goto iagain;
}
@@ -1575,11 +1575,11 @@ write_builtin_type (type)
else if (type == long_double_type_node)
write_char ('e');
else
- my_friendly_abort (20000409);
+ abort ();
break;
default:
- my_friendly_abort (20000509);
+ abort ();
}
}
@@ -1877,7 +1877,7 @@ write_template_arg_literal (value)
else if (value == boolean_true_node)
write_unsigned_number (1);
else
- my_friendly_abort (20000412);
+ abort ();
}
else
write_integer_cst (value);
@@ -1902,7 +1902,7 @@ write_template_arg_literal (value)
#endif
}
else
- my_friendly_abort (20000412);
+ abort ();
write_char ('E');
}
@@ -2069,7 +2069,7 @@ write_template_param (parm)
break;
default:
- my_friendly_abort (20000523);
+ abort ();
}
write_char ('T');
@@ -2477,6 +2477,6 @@ write_java_integer_type_codes (type)
else if (type == java_boolean_type_node)
write_char ('b');
else
- my_friendly_abort (20001207);
+ abort ();
}
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 8cb30a81de7..0848bd35a27 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -159,7 +159,7 @@ hack_identifier (value, name)
fndecl = TREE_VALUE (fields);
my_friendly_assert (TREE_CODE (fndecl) == FUNCTION_DECL, 251);
/* I could not trigger this code. MvL */
- my_friendly_abort (980325);
+ abort ();
#ifdef DEAD
if (DECL_CHAIN (fndecl) == NULL_TREE)
{
@@ -1020,7 +1020,7 @@ implicitly_declare_fn (kind, type, const_p)
break;
}
default:
- my_friendly_abort (59);
+ abort ();
}
TREE_PARMLIST (args) = 1;
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 0f0d93bbdfc..5084f727823 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -352,7 +352,7 @@ push_inline_template_parms_recursive (parmlist, levels)
break;
default:
- my_friendly_abort (0);
+ abort ();
}
}
}
@@ -1448,7 +1448,7 @@ check_explicit_specialization (declarator, decl, template_count, flags)
break;
default:
- my_friendly_abort (20000309);
+ abort ();
}
if (specialization || member_specialization)
@@ -3158,7 +3158,7 @@ convert_nontype_argument (type, expr)
default:
/* All non-type parameters must have one of these types. */
- my_friendly_abort (0);
+ abort ();
break;
}
@@ -3247,7 +3247,7 @@ coerce_template_template_parms (parm_parms, arg_parms, complain,
break;
default:
- my_friendly_abort (0);
+ abort ();
}
}
return 1;
@@ -5210,7 +5210,7 @@ instantiate_class_template (type)
tsubst_friend_function (TREE_VALUE (friends),
args));
else
- my_friendly_abort (20000216);
+ abort ();
}
for (t = CLASSTYPE_FRIEND_CLASSES (pattern);
@@ -6058,7 +6058,7 @@ tsubst_decl (t, args, type)
break;
default:
- my_friendly_abort (0);
+ abort ();
}
/* Restore the file and line information. */
@@ -6259,7 +6259,7 @@ tsubst (t, args, complain, in_decl)
else
type = TREE_TYPE (t);
if (type == unknown_type_node)
- my_friendly_abort (42);
+ abort ();
if (type && TREE_CODE (t) != FUNCTION_DECL
&& TREE_CODE (t) != TYPENAME_TYPE
@@ -6432,7 +6432,7 @@ tsubst (t, args, complain, in_decl)
}
}
else
- my_friendly_abort (981018);
+ abort ();
if (level == 1)
/* This can happen during the attempted tsubst'ing in
@@ -6483,7 +6483,7 @@ tsubst (t, args, complain, in_decl)
break;
default:
- my_friendly_abort (0);
+ abort ();
}
return r;
@@ -6931,7 +6931,7 @@ tsubst_copy (t, args, complain, in_decl)
/* We didn't find the name. That should never happen; if
name-lookup found it during preliminary parsing, we
should find it again here during instantiation. */
- my_friendly_abort (0);
+ abort ();
}
return t;
@@ -7592,7 +7592,7 @@ instantiate_template (tmpl, targ_ptr)
if (DECL_NAME (clone) == DECL_NAME (tmpl))
return clone;
/* We should always have found the clone by now. */
- my_friendly_abort (20000411);
+ abort ();
return NULL_TREE;
}
@@ -7844,7 +7844,7 @@ maybe_adjust_types_for_deduction (strict, parm, arg)
}
break;
default:
- my_friendly_abort (0);
+ abort ();
}
if (TREE_CODE (*parm) != REFERENCE_TYPE)
@@ -7939,7 +7939,7 @@ type_unification_real (tparms, targs, xparms, xargs, subr,
break;
default:
- my_friendly_abort (0);
+ abort ();
}
if (xlen == 0)
@@ -8137,7 +8137,7 @@ resolve_overloaded_unification (tparms, targs, parm, arg, strict,
}
}
else
- my_friendly_abort (981006);
+ abort ();
/* [temp.deduct.type] A template-argument can be deduced from a pointer
to function or pointer to member function argument if the set of
@@ -8455,7 +8455,7 @@ template_decl_level (decl)
return TEMPLATE_PARM_LEVEL (DECL_INITIAL (decl));
default:
- my_friendly_abort (0);
+ abort ();
return 0;
}
}
@@ -8731,7 +8731,7 @@ unify (tparms, targs, parm, arg, strict)
else if (i == 0)
return 1;
else
- my_friendly_abort (42);
+ abort ();
}
/* [temp.deduct.type] If, in the declaration of a function template
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 796add92952..fe2eb62601b 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -103,7 +103,7 @@ repo_get_id (t)
the vtable, so going ahead would give the wrong answer.
See g++.pt/instantiate4.C. */
if (!COMPLETE_TYPE_P (t) || TYPE_BEING_DEFINED (t))
- my_friendly_abort (981113);
+ abort ();
vtable = get_vtbl_decl_for_binfo (TYPE_BINFO (t));
@@ -147,7 +147,7 @@ repo_template_used (t)
0);
}
else
- my_friendly_abort (1);
+ abort ();
if (! IDENTIFIER_REPO_USED (id))
{
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index af401299adb..8c9b1c14f7f 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -1075,7 +1075,7 @@ synthesize_tinfo_var (target_type, real_name)
var_init = generic_initializer (var_type, target_type);
break;
}
- my_friendly_abort (20000117);
+ abort ();
}
return create_real_tinfo_var (target_type,
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 046960d41b3..22d53323468 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1414,7 +1414,7 @@ lookup_member (xbasetype, name, protect, want_type)
980827);
}
else
- my_friendly_abort (97);
+ abort ();
complete_type (type);
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index eade7004f2f..1f8d4816476 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2168,7 +2168,7 @@ cp_expand_stmt (t)
break;
default:
- my_friendly_abort (19990810);
+ abort ();
break;
}
}
diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c
index 9f36d06b42b..74f89a05a53 100644
--- a/gcc/cp/spew.c
+++ b/gcc/cp/spew.c
@@ -675,7 +675,7 @@ do_aggr ()
nth_token (1)->yychar = IDENTIFIER_DEFN;
break;
default:
- my_friendly_abort (102);
+ abort ();
}
}
@@ -917,7 +917,7 @@ frob_id (yyc, peek, idp)
lastiddecl = trrr;
break;
default:
- my_friendly_abort (20000907);
+ abort ();
}
}
else
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index b1271442a36..d353b06b808 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -127,7 +127,7 @@ lvalue_p_1 (ref, treat_class_rvalues_as_lvalues)
/* A currently unresolved scope ref. */
case SCOPE_REF:
- my_friendly_abort (103);
+ abort ();
case OFFSET_REF:
if (TREE_CODE (TREE_OPERAND (ref, 1)) == FUNCTION_DECL)
return clk_ordinary;
@@ -896,7 +896,7 @@ count_functions (t)
return i;
}
- my_friendly_abort (359);
+ abort ();
return 0;
}
@@ -1049,7 +1049,7 @@ lang_printable_name (decl, v)
if (ring_counter == PRINT_RING_SIZE)
ring_counter = 0;
if (decl_ring[ring_counter] == current_function_decl)
- my_friendly_abort (106);
+ abort ();
}
if (print_ring[ring_counter])
@@ -1155,7 +1155,7 @@ verify_stmt_tree_r (tp, walk_subtrees, data)
/* If this statement is already present in the hash table, then
there is a circularity in the statement tree. */
if (htab_find (*statements, t))
- my_friendly_abort (20000727);
+ abort ();
slot = htab_find_slot (*statements, t, INSERT);
*slot = t;
@@ -1480,7 +1480,7 @@ get_type_decl (t)
if (t == error_mark_node)
return t;
- my_friendly_abort (42);
+ abort ();
/* Stop compiler from complaining control reaches end of non-void function. */
return 0;
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index c189b6d37c8..5e69b98fc9d 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -585,7 +585,7 @@ common_type (t1, t2)
case REAL_TYPE:
/* We should have called type_after_usual_arithmetic_conversions
above. */
- my_friendly_abort (19990725);
+ abort ();
break;
case POINTER_TYPE:
@@ -759,7 +759,7 @@ common_type (t1, t2)
case OFFSET_TYPE:
/* Pointers to members should now be handled by the POINTER_TYPE
case above. */
- my_friendly_abort (990325);
+ abort ();
default:
return build_type_attribute_variant (t1, attributes);
@@ -1729,7 +1729,7 @@ decay_conversion (exp)
return error_mark_node;
}
if (code == METHOD_TYPE)
- my_friendly_abort (990506);
+ abort ();
if (code == FUNCTION_TYPE || is_overloaded_fn (exp))
return build_unary_op (ADDR_EXPR, exp, 0);
if (code == ARRAY_TYPE)
@@ -2057,7 +2057,7 @@ build_component_ref (datum, component, basetype_path, protect)
if (TREE_CODE (component) == TREE_LIST)
{
/* I could not trigger this code. MvL */
- my_friendly_abort (980326);
+ abort ();
#ifdef DEAD
my_friendly_assert (!(TREE_CHAIN (component) == NULL_TREE
&& DECL_CHAIN (TREE_VALUE (component)) == NULL_TREE), 309);
@@ -2811,7 +2811,7 @@ build_x_function_call (function, params, decl)
}
/* Unexpected node type? */
else
- my_friendly_abort (116);
+ abort ();
if (decl == NULL_TREE)
{
if (current_function_decl
@@ -3705,7 +3705,7 @@ build_binary_op (code, orig_op0, orig_op1, convert_p)
&& same_type_p (TYPE_PTRMEMFUNC_FN_TYPE (type0), type1))
|| (TYPE_PTRMEMFUNC_P (type1)
&& same_type_p (TYPE_PTRMEMFUNC_FN_TYPE (type1), type0)))
- my_friendly_abort (20000221);
+ abort ();
break;
case MAX_EXPR:
@@ -4672,7 +4672,7 @@ build_unary_op (code, xarg, noconvert)
if (TREE_CODE (arg) == IDENTIFIER_NODE
&& IDENTIFIER_OPNAME_P (arg))
{
- my_friendly_abort (117);
+ abort ();
/* We don't know the type yet, so just work around the problem.
We know that this will resolve to an lvalue. */
return build1 (ADDR_EXPR, unknown_type_node, arg);
@@ -6263,7 +6263,7 @@ convert_for_assignment (type, rhs, errtype, fndecl, parmnum)
register enum tree_code coder;
if (codel == OFFSET_TYPE)
- my_friendly_abort (990505);
+ abort ();
if (TREE_CODE (rhs) == OFFSET_REF)
rhs = resolve_offset_ref (rhs);
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 2ccd29ed539..05b4aca9f1c 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -248,7 +248,7 @@ retry:
break;
default:
- my_friendly_abort (108);
+ abort ();
}
}
@@ -318,7 +318,7 @@ store_init_value (decl, init)
{
if (! TYPE_HAS_TRIVIAL_INIT_REF (type)
&& TREE_CODE (init) != CONSTRUCTOR)
- my_friendly_abort (109);
+ abort ();
if (TREE_CODE (init) == TREE_LIST)
{
@@ -925,7 +925,7 @@ process_init_constructor (type, init, elts)
next1 = digest_init (TREE_TYPE (field),
TREE_VALUE (tail), &tail1);
if (tail1 != 0 && TREE_CODE (tail1) != TREE_LIST)
- my_friendly_abort (357);
+ abort ();
tail = tail1;
}
else
diff --git a/gcc/cp/xref.c b/gcc/cp/xref.c
index 77272fb5513..4560c4a2c6f 100644
--- a/gcc/cp/xref.c
+++ b/gcc/cp/xref.c
@@ -376,7 +376,7 @@ GNU_xref_decl (fndecl,decl)
else if (TREE_CODE (DECL_RESULT (decl)) == VAR_DECL)
cls = "VARTEMP";
else
- my_friendly_abort (358);
+ abort ();
uselin = TRUE;
}
else cls = "UNKNOWN";