diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2007-08-25 07:36:35 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2007-08-25 07:36:35 +0000 |
| commit | e2c3721c55d9c73c13a149b649522a2ab26a300d (patch) | |
| tree | 04d6f366703986c060bd377e1803b71669165e0b /gcc/cp/lex.c | |
| parent | 65fedc2c74fc2a77798553ea0dffc070c36a8773 (diff) | |
| download | gcc-e2c3721c55d9c73c13a149b649522a2ab26a300d.zip gcc-e2c3721c55d9c73c13a149b649522a2ab26a300d.tar.gz gcc-e2c3721c55d9c73c13a149b649522a2ab26a300d.tar.bz2 | |
decl.c (cp_tree_node_structure): Kill TINST_LEVEL case.
2007-08-25 Paolo Bonzini <bonzini@gnu.org>
* decl.c (cp_tree_node_structure): Kill TINST_LEVEL case.
* cp-objcp-common.c (cp_tree_size): Ditto.
* tree.c (cp_walk_subtrees): Ditto
* cp-tree.def (TINST_LEVEL): Go away.
* cp-tree.h (struct tinst_level_s): Rename to struct tinst_level,
move together with other non-tree structs.
(enum cp_tree_node_structure_enum): Nuke TS_CP_TINST_LEVEL.
(union lang_tree_node): Eliminate tinst_level field.
(TINST_DECL, TINST_LOCATION, TINST_IN_SYSTEM_HEADER_P): Annihilate.
(current_instantiation, outermost_tinst_level): Return
a "struct tinst_level *".
* error.c (print_instantiation_partial_context): Change second
parameter to a "struct tinst_level *". Replace accessor macros
with field access.
(print_instantiation_full_context): Likewise.
* lex.c (in_main_input_context): Likewise.
* pt.c (struct pending_templates): New.
(pending_templates, last_pending_template): Use it as a type.
(current_tinst_level): Change typo to "struct tinst_level *"
(reopen_tinst_level): Accept "struct tinst_level *", return decl.
(add_pending_template): Construct a "struct pending_template".
Replace TINST_LEVEL accessor macros with field access.
(push_tinst_level): Likewise, using GGC_NEW instead of make_node.
(pop_tinst_level): Likewise.
(instantiate_pending_templates): Likewise. Factor common code used
when an instantiation has been done.
(outermost_tinst_level): Replace tree_last with loop.
(current_instantiation): Return a "struct tinst_level *".
From-SVN: r127796
Diffstat (limited to 'gcc/cp/lex.c')
| -rw-r--r-- | gcc/cp/lex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index e62887d..3bb1bf4 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -856,11 +856,11 @@ make_aggr_type (enum tree_code code) bool in_main_input_context (void) { - tree tl = outermost_tinst_level(); + struct tinst_level *tl = outermost_tinst_level(); if (tl) return strcmp (main_input_filename, - LOCATION_FILE (TINST_LOCATION (tl))) == 0; + LOCATION_FILE (tl->locus)) == 0; else return strcmp (main_input_filename, input_filename) == 0; } |