From 5662a50dd8c7116df0ad182ce6792dfeeb0f72aa Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 30 Mar 2005 21:34:41 +0000 Subject: [PATCH] tree.def (FILE_TYPE): Removed. gcc: * tree.def (FILE_TYPE): Removed. * typeclass.h (enum type_class): Removed file_type_class. * dwarf2out.c (is_base_type): Updated. (gen_type_die): Likewise. * dbxout.c (dbxout_type): Updated. * builtins.c (type_to_class): Updated. * tree.c (type_contains_placeholder_1): Updated. * config/sparc/sparc.c (sparc_type_code): Updated. * config/ia64/ia64.c (hfa_element_mode): Updated. * expr.c (count_type_elements): Updated. * stor-layout.c (layout_type): Updated. * tree-inline.c (remap_type): Updated. * tree-pretty-print.c (dump_generic_node): Updated. gcc/java: * decl.c (gnat_substitute_in_type): Don't handle FILE_TYPE. From-SVN: r97282 --- gcc/ChangeLog | 16 ++++++++++++++++ gcc/ada/ChangeLog | 4 ++++ gcc/ada/decl.c | 1 - gcc/builtins.c | 1 - gcc/config/ia64/ia64.c | 2 +- gcc/config/sparc/sparc.c | 1 - gcc/dbxout.c | 5 ----- gcc/dwarf2out.c | 7 ------- gcc/expr.c | 1 - gcc/stor-layout.c | 8 -------- gcc/tree-inline.c | 1 - gcc/tree-pretty-print.c | 6 +----- gcc/tree.c | 1 - gcc/tree.def | 3 --- gcc/typeclass.h | 4 ++-- 15 files changed, 24 insertions(+), 37 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 384e48e8cdc0..2adae1617e3e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,19 @@ +2005-03-30 Tom Tromey + + * tree.def (FILE_TYPE): Removed. + * typeclass.h (enum type_class): Removed file_type_class. + * dwarf2out.c (is_base_type): Updated. + (gen_type_die): Likewise. + * dbxout.c (dbxout_type): Updated. + * builtins.c (type_to_class): Updated. + * tree.c (type_contains_placeholder_1): Updated. + * config/sparc/sparc.c (sparc_type_code): Updated. + * config/ia64/ia64.c (hfa_element_mode): Updated. + * expr.c (count_type_elements): Updated. + * stor-layout.c (layout_type): Updated. + * tree-inline.c (remap_type): Updated. + * tree-pretty-print.c (dump_generic_node): Updated. + 2005-03-30 Fariborz Jahanian * builtins.c (expand_builtin_powi): Fix mode of diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b36fc5b60106..035d8313366a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2005-03-30 Tom Tromey + + * decl.c (gnat_substitute_in_type): Don't handle FILE_TYPE. + 2005-03-30 Aaron W. LaFramboise * adaint.c (_gnat_set_close_on_exec): Mark parameters unused. diff --git a/gcc/ada/decl.c b/gcc/ada/decl.c index 9d2e8fe871de..5f53e19e797f 100644 --- a/gcc/ada/decl.c +++ b/gcc/ada/decl.c @@ -6402,7 +6402,6 @@ gnat_substitute_in_type (tree t, tree f, tree r) case OFFSET_TYPE: case METHOD_TYPE: - case FILE_TYPE: case FUNCTION_TYPE: case LANG_TYPE: /* Don't know how to do these yet. */ diff --git a/gcc/builtins.c b/gcc/builtins.c index fb044de52ac9..56bdc873df34 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -1478,7 +1478,6 @@ type_to_class (tree type) case QUAL_UNION_TYPE: return union_type_class; case ARRAY_TYPE: return (TYPE_STRING_FLAG (type) ? string_type_class : array_type_class); - case FILE_TYPE: return file_type_class; case LANG_TYPE: return lang_type_class; default: return no_type_class; } diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c index e18b348659d1..3d15f4036327 100644 --- a/gcc/config/ia64/ia64.c +++ b/gcc/config/ia64/ia64.c @@ -3348,7 +3348,7 @@ hfa_element_mode (tree type, bool nested) case VOID_TYPE: case INTEGER_TYPE: case ENUMERAL_TYPE: case BOOLEAN_TYPE: case CHAR_TYPE: case POINTER_TYPE: case OFFSET_TYPE: case REFERENCE_TYPE: case METHOD_TYPE: - case FILE_TYPE: case LANG_TYPE: case FUNCTION_TYPE: + case LANG_TYPE: case FUNCTION_TYPE: return VOIDmode; /* Fortran complex types are supposed to be HFAs, so we need to handle diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index 3827d7b1cf87..6823915097a5 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -7727,7 +7727,6 @@ sparc_type_code (register tree type) case VECTOR_TYPE: case CHAR_TYPE: /* GNU Pascal CHAR type. Not used in C. */ case BOOLEAN_TYPE: /* GNU Fortran BOOLEAN type. */ - case FILE_TYPE: /* GNU Pascal FILE type. */ case LANG_TYPE: /* ? */ return qualifiers; diff --git a/gcc/dbxout.c b/gcc/dbxout.c index 271cc1984031..92538b8ce107 100644 --- a/gcc/dbxout.c +++ b/gcc/dbxout.c @@ -1932,11 +1932,6 @@ dbxout_type (tree type, int full) stabstr_S ("eFalse:0,True:1,;"); break; - case FILE_TYPE: - stabstr_C ('d'); - dbxout_type (TREE_TYPE (type), 0); - break; - case COMPLEX_TYPE: /* Differs from the REAL_TYPE by its new data type number. R3 is NF_COMPLEX. We don't try to use any of the other NF_* diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 24e573b2ea4c..63356629e070 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -8016,7 +8016,6 @@ is_base_type (tree type) case METHOD_TYPE: case POINTER_TYPE: case REFERENCE_TYPE: - case FILE_TYPE: case OFFSET_TYPE: case LANG_TYPE: case VECTOR_TYPE: @@ -12110,12 +12109,6 @@ gen_type_die (tree type, dw_die_ref context_die) gen_ptr_to_mbr_type_die (type, context_die); break; - case FILE_TYPE: - gen_type_die (TREE_TYPE (type), context_die); - /* No way to represent these in Dwarf yet! */ - gcc_unreachable (); - break; - case FUNCTION_TYPE: /* Force out return type (in case it wasn't forced out already). */ gen_type_die (TREE_TYPE (type), context_die); diff --git a/gcc/expr.c b/gcc/expr.c index 9e08315531f0..c2a6e7db9a79 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -4522,7 +4522,6 @@ count_type_elements (tree type) case VOID_TYPE: case METHOD_TYPE: - case FILE_TYPE: case FUNCTION_TYPE: case LANG_TYPE: default: diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 2814622cd63e..25420e0d5ed5 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -1759,14 +1759,6 @@ layout_type (tree type) } break; - case FILE_TYPE: - /* The size may vary in different languages, so the language front end - should fill in the size. */ - TYPE_ALIGN (type) = BIGGEST_ALIGNMENT; - TYPE_USER_ALIGN (type) = 0; - TYPE_MODE (type) = BLKmode; - break; - default: gcc_unreachable (); } diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 0b38f08724c6..88bef203862a 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -321,7 +321,6 @@ remap_type (tree type, inline_data *id) walk_tree (&TYPE_FIELDS (new), copy_body_r, id, NULL); break; - case FILE_TYPE: case OFFSET_TYPE: default: /* Shouldn't have been thought variable sized. */ diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 6c1eed84dcc8..743e1592e4de 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -1,5 +1,5 @@ /* Pretty formatting of GENERIC trees in C syntax. - Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Adapted from c-pretty-print.c by Diego Novillo This file is part of GCC. @@ -441,10 +441,6 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, pp_string (buffer, "::"); break; - case FILE_TYPE: - NIY; - break; - case ARRAY_TYPE: { tree tmp; diff --git a/gcc/tree.c b/gcc/tree.c index de1ffb21d66d..a4969a0ae519 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -1908,7 +1908,6 @@ type_contains_placeholder_1 (tree type) case OFFSET_TYPE: case REFERENCE_TYPE: case METHOD_TYPE: - case FILE_TYPE: case FUNCTION_TYPE: case VECTOR_TYPE: return false; diff --git a/gcc/tree.def b/gcc/tree.def index bcb38849857e..08e28068167a 100644 --- a/gcc/tree.def +++ b/gcc/tree.def @@ -254,9 +254,6 @@ DEFTREECODE (FUNCTION_TYPE, "function_type", tcc_type, 0) includes the hidden argument for "self". */ DEFTREECODE (METHOD_TYPE, "method_type", tcc_type, 0) -/* Used for Pascal; details not determined right now. */ -DEFTREECODE (FILE_TYPE, "file_type", tcc_type, 0) - /* This is a language-specific kind of type. Its meaning is defined by the language front end. layout_type does not know how to lay this out, diff --git a/gcc/typeclass.h b/gcc/typeclass.h index 5f3621425750..a4e15703b77f 100644 --- a/gcc/typeclass.h +++ b/gcc/typeclass.h @@ -1,5 +1,5 @@ /* Type class enum - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GCC. @@ -39,7 +39,7 @@ enum type_class real_type_class, complex_type_class, function_type_class, method_type_class, record_type_class, union_type_class, - array_type_class, string_type_class, file_type_class, + array_type_class, string_type_class, lang_type_class };