diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2001-12-29 17:24:59 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2001-12-29 17:24:59 +0000 |
| commit | 41f5d4b195481b8a36adbff6376921f1ef14f02c (patch) | |
| tree | 19eb5b6cc76462267091b0eee5b279613bc866d5 /gcc/cp/call.c | |
| parent | f3368a9098c3aa67ef422208978bf8df6353bc5a (diff) | |
| download | gcc-41f5d4b195481b8a36adbff6376921f1ef14f02c.zip gcc-41f5d4b195481b8a36adbff6376921f1ef14f02c.tar.gz gcc-41f5d4b195481b8a36adbff6376921f1ef14f02c.tar.bz2 | |
call.c (build_user_type_conversion_1): Use my_friendly_assert rather than if ...
cp:
* call.c (build_user_type_conversion_1): Use my_friendly_assert
rather than if ... abort.
* cvt.c (convert_to_reference): Likewise.
* semantics.c (setup_vtbl_ptr): Likewise.
* pt.c (lookup_template_class): Comment typo.
From-SVN: r48371
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index d8129a7..865d1ef 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -2376,9 +2376,8 @@ build_user_type_conversion_1 (totype, expr, flags) /* We represent conversion within a hierarchy using RVALUE_CONV and BASE_CONV, as specified by [over.best.ics]; these become plain constructor calls, as specified in [dcl.init]. */ - if (IS_AGGR_TYPE (fromtype) && IS_AGGR_TYPE (totype) - && DERIVED_FROM_P (totype, fromtype)) - abort (); + my_friendly_assert (!IS_AGGR_TYPE (fromtype) || !IS_AGGR_TYPE (totype) + || !DERIVED_FROM_P (totype, fromtype), 20011226); if (IS_AGGR_TYPE (totype)) ctors = lookup_fnfields (TYPE_BINFO (totype), @@ -2400,11 +2399,11 @@ build_user_type_conversion_1 (totype, expr, flags) t = build_int_2 (0, 0); TREE_TYPE (t) = build_pointer_type (totype); args = build_tree_list (NULL_TREE, expr); - if (DECL_HAS_IN_CHARGE_PARM_P (OVL_CURRENT (ctors)) - || DECL_HAS_VTT_PARM_P (OVL_CURRENT (ctors))) - /* We should never try to call the abstract or base constructor - from here. */ - abort (); + /* We should never try to call the abstract or base constructor + from here. */ + my_friendly_assert (!DECL_HAS_IN_CHARGE_PARM_P (OVL_CURRENT (ctors)) + && !DECL_HAS_VTT_PARM_P (OVL_CURRENT (ctors)), + 20011226); args = tree_cons (NULL_TREE, t, args); } for (; ctors; ctors = OVL_NEXT (ctors)) |