diff options
| author | Kazu Hirata <kazu@cs.umass.edu> | 2005-03-05 20:21:31 +0000 |
|---|---|---|
| committer | Kazu Hirata <kazu@gcc.gnu.org> | 2005-03-05 20:21:31 +0000 |
| commit | 3f724eb8a71c5aa02709ff34b93d272881bf69f8 (patch) | |
| tree | fba2d3323d7f2571f5c37de39187febd503d8e75 /gcc | |
| parent | 19db01bb4587701a48494f8ec1ef18933652a614 (diff) | |
| download | gcc-3f724eb8a71c5aa02709ff34b93d272881bf69f8.zip gcc-3f724eb8a71c5aa02709ff34b93d272881bf69f8.tar.gz gcc-3f724eb8a71c5aa02709ff34b93d272881bf69f8.tar.bz2 | |
c-semantics.c (build_stmt): Use TYPE_P instead of IS_NON_TYPE_CODE_CLASS.
gcc/
* c-semantics.c (build_stmt): Use TYPE_P instead of
IS_NON_TYPE_CODE_CLASS.
* tree.h (IS_NON_TYPE_CODE_CLASS): Remove.
(NON_TYPE_CHECK): Use TYPE_P instead of
IS_NON_TYPE_CODE_CLASS.
java/
* expr.c (build_expr_wfl, expr_add_location): Use TYPE_P
instead of IS_NON_TYPE_CODE_CLASS.
From-SVN: r95942
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/c-semantics.c | 2 | ||||
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/expr.c | 4 | ||||
| -rw-r--r-- | gcc/tree.h | 7 |
5 files changed, 17 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6e8b77f..3224ef2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2005-03-05 Kazu Hirata <kazu@cs.umass.edu> + + * c-semantics.c (build_stmt): Use TYPE_P instead of + IS_NON_TYPE_CODE_CLASS. + * tree.h (IS_NON_TYPE_CODE_CLASS): Remove. + (NON_TYPE_CHECK): Use TYPE_P instead of + IS_NON_TYPE_CODE_CLASS. + 2005-03-05 James A. Morrison <phython@gcc.gnu.org> * doc/c-tree.texi: Wrap comments in @r{}. diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c index 658a12d..ec902b6 100644 --- a/gcc/c-semantics.c +++ b/gcc/c-semantics.c @@ -164,7 +164,7 @@ build_stmt (enum tree_code code, ...) for (i = 0; i < length; i++) { tree t = va_arg (p, tree); - if (t && IS_NON_TYPE_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (t)))) + if (t && !TYPE_P (t)) side_effects |= TREE_SIDE_EFFECTS (t); TREE_OPERAND (ret, i) = t; } diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index cee0acb..8623ea3 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2005-03-05 Kazu Hirata <kazu@cs.umass.edu> + + * expr.c (build_expr_wfl, expr_add_location): Use TYPE_P + instead of IS_NON_TYPE_CODE_CLASS. + 2005-03-04 Andrew Haley <aph@redhat.com> PR java/18362 diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 7d51505..2c517a1 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -3591,7 +3591,7 @@ build_expr_wfl (tree node, EXPR_WFL_NODE (wfl) = node; if (node) { - if (IS_NON_TYPE_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (node)))) + if (!TYPE_P (node)) TREE_SIDE_EFFECTS (wfl) = TREE_SIDE_EFFECTS (node); TREE_TYPE (wfl) = TREE_TYPE (node); } @@ -3627,7 +3627,7 @@ expr_add_location (tree node, source_location location, bool statement) EXPR_WFL_EMIT_LINE_NOTE (wfl) = 1; if (node) { - if (IS_NON_TYPE_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (node)))) + if (!TYPE_P (node)) TREE_SIDE_EFFECTS (wfl) = TREE_SIDE_EFFECTS (node); TREE_TYPE (wfl) = TREE_TYPE (node); } @@ -134,10 +134,6 @@ extern const enum tree_code_class tree_code_type[]; #define EXPRESSION_CLASS_P(CODE)\ (TREE_CODE_CLASS (TREE_CODE (CODE)) == tcc_expression) -/* Returns nonzero iff CLASS is not the tree code of a type. */ - -#define IS_NON_TYPE_CODE_CLASS(CLASS) ((CLASS) != tcc_type) - /* Returns nonzero iff CODE represents a type or declaration. */ #define IS_TYPE_OR_DECL_P(CODE)\ @@ -557,8 +553,7 @@ struct tree_common GTY(()) /* These checks have to be special cased. */ #define NON_TYPE_CHECK(T) __extension__ \ ({ const tree __t = (T); \ - char const __c = TREE_CODE_CLASS (TREE_CODE (__t)); \ - if (!IS_NON_TYPE_CODE_CLASS (__c)) \ + if (TYPE_P (__t)) \ tree_class_check_failed (__t, tcc_type, __FILE__, __LINE__, \ __FUNCTION__); \ __t; }) |