diff options
| -rw-r--r-- | gcc/c-common.c | 9 | ||||
| -rw-r--r-- | gcc/c-common.h | 3 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 5 |
4 files changed, 10 insertions, 11 deletions
diff --git a/gcc/c-common.c b/gcc/c-common.c index bd8ea6c32c3..d3d03782cbb 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -2738,7 +2738,7 @@ c_sizeof_or_alignof_type (tree type, enum tree_code op, int complain) tree value = NULL; enum tree_code type_code = TREE_CODE (type); - my_friendly_assert (op == SIZEOF_EXPR || op == ALIGNOF_EXPR, 20020720); + gcc_assert (op == SIZEOF_EXPR || op == ALIGNOF_EXPR); op_name = op == SIZEOF_EXPR ? "sizeof" : "__alignof__"; if (type_code == FUNCTION_TYPE) @@ -2782,7 +2782,7 @@ c_sizeof_or_alignof_type (tree type, enum tree_code op, int complain) never happen. However, this node should really have type `size_t', which is just a typedef for an ordinary integer type. */ value = fold (build1 (NOP_EXPR, size_type_node, value)); - my_friendly_assert (!TYPE_IS_SIZETYPE (TREE_TYPE (value)), 20001021); + gcc_assert (!TYPE_IS_SIZETYPE (TREE_TYPE (value))); return value; } @@ -4638,9 +4638,8 @@ handle_visibility_attribute (tree *node, tree name, tree args, bool c_determine_visibility (tree decl) { - my_friendly_assert (TREE_CODE (decl) == VAR_DECL - || TREE_CODE (decl) == FUNCTION_DECL, - 20040805); + gcc_assert (TREE_CODE (decl) == VAR_DECL + || TREE_CODE (decl) == FUNCTION_DECL); /* If the user explicitly specified the visibility with an attribute, honor that. DECL_VISIBILITY will have been set during diff --git a/gcc/c-common.h b/gcc/c-common.h index 86706e6e817..4403ceee0fd 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -650,9 +650,6 @@ extern tree c_alignof_expr (tree); /* Print an error message for invalid operands to arith operation CODE. NOP_EXPR is used as a special case (see truthvalue_conversion). */ extern void binary_op_error (enum tree_code); -#define my_friendly_assert(EXP, N) (void) \ - (((EXP) == 0) ? (fancy_abort (__FILE__, __LINE__, __FUNCTION__), 0) : 0) - extern tree fix_string_type (tree); struct varray_head_tag; extern void constant_expression_warning (tree); diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6b4bb4739f1..9baf0ec173a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2004-08-30 Nathan Sidwell <nathan@codesourcery.com> + + * cp-tree.h (SET_BINFO_NEW_VTABLE_MARKED): Use gcc_assert. + 2004-08-28 Ziemowit Laski <zlaski@apple.com> * Make-lang.in (CXX_OBJS): Split up into CXX_OBJS and diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 2eba7a316e4..a002ed27833 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1425,9 +1425,8 @@ struct lang_type GTY(()) derived class and never become non-primary.) */ #define SET_BINFO_NEW_VTABLE_MARKED(B) \ (BINFO_NEW_VTABLE_MARKED (B) = 1, \ - my_friendly_assert (!BINFO_PRIMARY_P (B) \ - || BINFO_VIRTUAL_P (B), 20000517), \ - my_friendly_assert (TYPE_VFIELD (BINFO_TYPE (B)), 20000517)) + gcc_assert (!BINFO_PRIMARY_P (B) || BINFO_VIRTUAL_P (B)), \ + gcc_assert (TYPE_VFIELD (BINFO_TYPE (B)))) /* Nonzero if this BINFO is a primary base class. */ |