From: Richard Guenther Date: Wed, 8 Sep 2010 08:52:19 +0000 (+0000) Subject: tree.h (TYPE_ORIG_SIZE_TYPE): Remove. X-Git-Tag: releases/gcc-4.6.0~4559 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1814522d1e3576dc0b041cc80a1aba5fde88219b;p=thirdparty%2Fgcc.git tree.h (TYPE_ORIG_SIZE_TYPE): Remove. 2010-09-08 Richard Guenther * tree.h (TYPE_ORIG_SIZE_TYPE): Remove. * c-typeck.c (comptypes_internal): Remove TYPE_ORIG_SIZE_TYPE checks. From-SVN: r163994 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc5a194c055f..347e0aef6e57 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-09-08 Richard Guenther + + * tree.h (TYPE_ORIG_SIZE_TYPE): Remove. + * c-typeck.c (comptypes_internal): Remove TYPE_ORIG_SIZE_TYPE + checks. + 2010-09-08 Arnaud Charlet * c-tree.h, c-decl.c (build_enumerator): Add location parameter. diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 08a3825a436f..7ac866abfeb2 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -1038,17 +1038,6 @@ comptypes_internal (const_tree type1, const_tree type2, bool *enum_and_int_p, || TREE_CODE (t1) == ERROR_MARK || TREE_CODE (t2) == ERROR_MARK) return 1; - /* If either type is the internal version of sizetype, return the - language version. */ - if (TREE_CODE (t1) == INTEGER_TYPE && TYPE_IS_SIZETYPE (t1) - && TYPE_ORIG_SIZE_TYPE (t1)) - t1 = TYPE_ORIG_SIZE_TYPE (t1); - - if (TREE_CODE (t2) == INTEGER_TYPE && TYPE_IS_SIZETYPE (t2) - && TYPE_ORIG_SIZE_TYPE (t2)) - t2 = TYPE_ORIG_SIZE_TYPE (t2); - - /* Enumerated types are compatible with integer types, but this is not transitive: two enumerated types in the same translation unit are compatible with each other only if they are the same type. */ diff --git a/gcc/tree.h b/gcc/tree.h index 815ba9c11633..96555e2eecc0 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -2056,9 +2056,6 @@ struct GTY(()) tree_block { #define TYPE_DOMAIN(NODE) (ARRAY_TYPE_CHECK (NODE)->type.values) #define TYPE_FIELDS(NODE) (RECORD_OR_UNION_CHECK (NODE)->type.values) #define TYPE_CACHED_VALUES(NODE) (TYPE_CHECK(NODE)->type.values) -#define TYPE_ORIG_SIZE_TYPE(NODE) \ - (INTEGER_TYPE_CHECK (NODE)->type.values \ - ? TREE_TYPE ((NODE)->type.values) : NULL_TREE) #define TYPE_METHODS(NODE) (RECORD_OR_UNION_CHECK (NODE)->type.maxval) #define TYPE_VFIELD(NODE) (RECORD_OR_UNION_CHECK (NODE)->type.minval) #define TYPE_ARG_TYPES(NODE) (FUNC_OR_METHOD_CHECK (NODE)->type.values)