1994-02-24 02:02:37 +01:00
|
|
|
|
/* Process declarations and variables for C compiler.
|
2000-02-26 21:16:12 +01:00
|
|
|
|
Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
|
2002-01-02 12:29:15 +01:00
|
|
|
|
1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
1994-02-24 02:02:37 +01:00
|
|
|
|
Hacked by Michael Tiemann (tiemann@cygnus.com)
|
|
|
|
|
|
|
|
|
|
This file is part of GNU CC.
|
|
|
|
|
|
|
|
|
|
GNU CC is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
GNU CC is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with GNU CC; see the file COPYING. If not, write to
|
1995-06-15 14:29:51 +02:00
|
|
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Process declarations and symbol lookup for C front end.
|
|
|
|
|
Also constructs types; the standard scalar types at initialization,
|
|
|
|
|
and structure, union, array and enum types when they are declared. */
|
|
|
|
|
|
|
|
|
|
/* ??? not all decl nodes are given the most useful possible
|
|
|
|
|
line numbers. For example, the CONST_DECLs for enum values. */
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
call.c: Include system.h.
* call.c: Include system.h. Remove includes, declarations and
defines provided by system.h.
* class.c, cvt.c, decl.c, decl2.c, errfn.c error.c: Likewise.
* except.c, expr.c friend.c, g++spec.c, init.c, input.c: Likewise.
* lex.c, parse.y, pt.c, ptree.c repo.c rtti.c, search.c: Likewise.
* semantics.c, sig.c, spew.c, tree.c, typeck.c: Likewise.
* typeck2.c, xref.c: Likewise.
* Makefile.in: Dependencies updated as appropriate.
* Make-lang.in: Likewise.
system.h cutover from the cp subdir
From-SVN: r18917
1998-03-31 15:25:46 +02:00
|
|
|
|
#include "system.h"
|
1994-02-24 02:02:37 +01:00
|
|
|
|
#include "tree.h"
|
|
|
|
|
#include "rtl.h"
|
2000-09-17 09:38:23 +02:00
|
|
|
|
#include "expr.h"
|
1994-02-24 02:02:37 +01:00
|
|
|
|
#include "flags.h"
|
|
|
|
|
#include "cp-tree.h"
|
|
|
|
|
#include "decl.h"
|
|
|
|
|
#include "lex.h"
|
1995-04-24 19:27:46 +02:00
|
|
|
|
#include "output.h"
|
[multiple changes]
Wed Aug 20 17:25:08 1997 Jason Merrill <jason@yorick.cygnus.com>
* call.c (is_subseq): Don't try to be clever.
Wed Aug 20 03:13:36 1997 H.J. Lu (hjl@gnu.ai.mit.edu)
* parse.y, pt.c: Include "except.h".
* call.c, class.c, class.h, cp-tree.h, cvt.c, decl.c, decl2.c,
error.c, except.c, expr.c, friend.c, g++spec.c, init.c, input.c,
lex.c, lex.h, method.c, parse.y, pt.c, repo.c, rtti.c, search.c,
sig.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c: Finish
prototyping.
Wed Aug 20 01:34:40 1997 Jason Merrill <jason@yorick.cygnus.com>
* decl2.c (mark_vtable_entries): Instead of replacing pure
virtuals with a reference to __pure_virtual, copy the decl and
change the RTL.
From-SVN: r14868
1997-08-21 02:50:39 +02:00
|
|
|
|
#include "except.h"
|
call.c, [...]: Add include of toplev.h.
Wed May 6 06:36:41 1998 Robert Lipe <robertl@dgii.com>
* cp/call.c, cp/class.c, cp/decl.c, cp/decl2.c,
cp/errfn.c, cp/error.c, cp/except.c, cp/expr.c,
cp/friend.c, cp/init.c, cp/lex.c, cp/method.c,
cp/pt.c, cp/repo.c, cp/rtti.c, cp/search.c,
cp/semantics.c, cp/sig.c, cp/tree.c, cp/typeck.c,
cp/typeck2.c, cp/xref.c: Add include of toplev.h.
From-SVN: r19565
1998-05-06 07:01:35 +02:00
|
|
|
|
#include "toplev.h"
|
1999-09-05 18:21:30 +02:00
|
|
|
|
#include "ggc.h"
|
Makefile.in (OBJS): Add timevar.o.
hangeLog:
* Makefile.in (OBJS): Add timevar.o.
(toplev.o): Depend on timevar.h.
(ggc-simple.o): Likewise.
(ggc-page.o): Likewise.
(timevar.o): New rule.
(timevar.h): New rule.
* timevar.h: New file.
* timevar.c: Likewise.
* timevar.def: Likewise.
* toplev.h (gc_time, parse_time, varconst_time): Remove.
* toplev.c: Use timevar_push and timevar_pop instead of TIMEVAR
throughout.
(TIMEVAR): Remove macro.
(gc_time, parse_time, varconst_time, integration_time, jump_time,
cse_time, gcse_time, loop_time, cse2_time, branch_prob_time,
flow_time, combine_time, regmove_time, sched_time,
local_alloc_time, global_alloc_time, flow2_time, peephole2_time,
sched2_time, dbr_sched_time, reorder_blocks_time,
rename_registers_time, shorten_branch_time, stack_reg_time,
to_ssa_time, from_ssa_time, final_time, symout_time, dump_time,
all_time): Remove.
(compile_file): Don't initialize time variables. Call
init_timevar and start TV_TOTAL timer. Call timevar_print instead
of many calls to print_time.
(rest_of_compilation): Add timing for reload_cse_regs.
(get_run_time): Removed to timevar.c.
(print_time): Likewise.
(get_run_time): Implement using TV_TOTAL time variable.
(print_time): Get total run time from get_run_time.
* ggc-page.c (ggc_collect): Push and pop TV_GC instead of
computing elapsed time explicitly.
* ggc-simple.c (ggc_collect): Likewise.
(gc_time): Remove declaration.
cp/ChangeLog:
* lex.c (my_get_run_time): Remove.
(init_filename_times): Use get_run_time instead of my_get_run_time.
(check_newline): Likewise.
(dump_time_statistics): Likewise.
* decl2.c (finish_file): Push and pop timevar TV_VARCONST instead
of computing elapsed time explicitly.
From-SVN: r33496
2000-04-28 02:59:40 +02:00
|
|
|
|
#include "timevar.h"
|
1998-06-10 12:16:45 +02:00
|
|
|
|
#include "cpplib.h"
|
Makefile.in (TARGET_H, [...]): New.
* Makefile.in (TARGET_H, TARGET_DEF_H): New.
(c-decl.o, tree.o, c-typeck.o, $(out_object_file)): Update.
* c-decl.c (duplicate_decls): Use function pointer.
* c-typeck.c (common_type): Similarly.
* tree.c (valid_machine_attribute): Similarly.
(merge_machine_type_attributes): Rename merge_type_attributes.
(merge_machine_decl_attributes): Rename merge_decl_attributes.
(merge_dllimport_decl_attributes): New function.
* tree.h (merge_machine_type_attributes): Rename merge_type_attributes.
(merge_machine_decl_attributes): Rename merge_decl_attributes.
(merge_dllimport_decl_attributes): New prototype.
* target.h: New.
* target-def.h: New.
doc: (Joseph Myers)
* doc/gcc.texi, doc/tm.texi: Update documentation.
cp: Make-lang.in: Update dependencies.
* spew.c: Include target.h.
(duplicate_decls): Call target function.
* decl2.c: include target.h
(import_export_class): Use existence of target function pointer.
* typeck.c: Include target.h.
(qualify_type_recursive): Rename variable. Call target function.
(type_after_usual_arithmetic_conversions): Similarly.
(common_type): Similarly.
config: * 1750a/1750a.c, a29k/29k.c, alpha/alpha.c, arc/arc.c, arm/arm.c,
avr/avr.c, c4x/c4x.c, clipper/clipper.c, convex/convex.c,
d30v/d30v.c, dsp16xx/dsp16xx.c, elxsi/elxsi.c, fr30/fr30.c,
i370/i370.c, i386/i386.c, i860/i860.c, i960/i960.c, ia64/ia64.c,
m32r/m32r.c, m68hc11/m68hc11.c, m68k/m68k.c, m88k/m88k.c,
mips/mips.c, mn10200/mn10200.c, mn10300/mn10300.c, ns32k/ns32k.c,
pa/pa.c, pdp11/pdp11.c, pj/pj.c, romp/romp.c, rs6000/rs6000.c,
sh/sh.c, sparc/sparc.c, v850/v850.c, vax/vax.c, we32k/we32k.c)
: Include target.h and target-def.h. Define target.
* arc/arc-protos.h (arc_valid_machine_decl_attribute): Remove.
* arc/arc.c (arc_valid_machine_decl_attribute): Rename
arc_valid_decl_attribute, make static.
* arc/arc.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* arm/arm-protos.h (arm_valid_machine_decl_attribute,
arm_valid_type_attribute_p, arm_pe_valid_machine_decl_attribute,
arm_pe_merge_machine_decl_attributes): Remove.
* arm/arm.c (arm_valid_machine_decl_attribute_p): Rename
arm_valid_decl_attribute_p, make static.
(arm_pe_valid_decl_attribute_p): Move from pe.c.
* arm/pe.c (arm_pe_valid_machine_decl_attribute_p): Move to arm.c.
(arm_pe_merge_machine_decl_attributes): Move to tree.c.
* arm/arm.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* arm/coff.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* arm/elf.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* arm/pe.h (TARGET_DLLIMPORT_DECL_ATTRIBUTES): New.
(VALID_MACHINE_TYPE_ATTRIBUTE, VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* avr/avr-protos.h (valid_machine_type_attribute,
valid_machine_decl_attribute): Remove.
* avr/avr.c (valid_machine_type_attribute,
valid_machine_decl_attribute): Rename and make static.
* avr/avr.h (VALID_MACHINE_TYPE_ATTRIBUTE,
VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* c4x/c4x-protos.h (c4x_valid_type_attribute_p): Remove.
* c4x/c4x.c (c4x_valid_type_attribute_p): Make static.
* c4x/c4x.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* d30v/d30v.h: Remove obsolete comments.
* h8300/h8300-protos.h (h8300_valid_machine_decl_attribute): Remove.
* h8300/h8300.c (h8300_valid_machine_decl_attribute): Rename, make
static.
* h8300/h8300.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* i386/cygwin.h (TARGET_DLLIMPORT_DECL_ATTRIBUTES): Define.
(i386_pe_merge_decl_attributes, MERGE_MACHINE_DECL_ATTRIBUTES,
i386_pe_valid_type_attributes_p): Remove.
* i386/i386-protos.h (ix86_valid_decl_attribute_p,
ix86_valid_type_attribute_p): Remove.
* i386/i386.c (ix86_valid_decl_attribute_p): Remove.
(ix86_valid_type_attribute_p): Make static.
* i386/i386.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* i386/winnt.c (i386_pe_merge_decl_attributes): Move to tree.c.
* ia64/ia64-protos.h (ia64_valid_type_attribute): Remove.
* ia64/ia64.c (ia64_valid_type_attribute): Make static.
* ia64/ia64.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* m32r/m32r-protos.h (m32r_valid_machine_decl_attribute): Remove.
* m32r/m32r.c (m32r_valid_decl_attribute): Make static.
* m32r/m32r.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* m68hc11/m68hc11-protos.h (m68hc11_valid_decl_attribute_p,
m68hc11_valid_type_attribute_p): Remove.
* m68hc11/m68hc11.c (m68hc11_valid_decl_attribute_p): Remove.
(m68hc11_valid_type_attribute_p): Make static.
* m68hc11/m68hc11.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* mcore/mcore-protos.h (mcore_valid_machine_decl_attribute,
mcore_merge_machine_decl_attribute): Remove.
* mcore/mcore.c (mcore_valid_machine_decl_attribute): Rename,
make static.
(mcore_merge_machine_decl_attributes): Move to tree.c.
* mcore/mcore.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
(TARGET_DLLIMPORT_DECL_ATTRIBUTES): Define.
* ns32k/ns32k-protos.h (ns32k_valid_decl_attribute_p,
ns32k_valid_type_attribute_p): Remove.
* ns32k/ns32k.c (ns32k_valid_decl_attribute_p): Remove.
(ns32k_valid_type_attribute_p): Make static.
* ns32k/ns32k.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* rs6000/rs6000-protos.h (rs6000_valid_decl_attribute_p,
rs6000_valid_type_attribute_p): Remove.
* rs6000/rs6000.c (rs6000_valid_decl_attribute_p): Remove.
(rs6000_valid_type_attribute_p): Make static.
* rs6000/rs6000.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* sh/sh-protos.h (sh_valid_machine_decl_attribute): Remove.
* sh/sh.c (sh_valid_machine_decl_attribute): Rename, make static.
* sh/sh.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* v850/v850-protos.h (v850_valid_machine_decl_attribute): Remove.
* v850/v850.c (v850_valid_machine_decl_attribute): Rename, make static.
* v850/v850.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
From-SVN: r43585
2001-06-26 20:09:27 +02:00
|
|
|
|
#include "target.h"
|
2002-05-07 00:53:10 +02:00
|
|
|
|
#include "c-common.h"
|
2000-11-28 22:13:35 +01:00
|
|
|
|
extern cpp_reader *parse_in;
|
1998-06-10 12:16:45 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* This structure contains information about the initializations
|
|
|
|
|
and/or destructions required for a particular priority level. */
|
|
|
|
|
typedef struct priority_info_s {
|
1999-04-30 18:14:58 +02:00
|
|
|
|
/* Non-zero if there have been any initializations at this priority
|
|
|
|
|
throughout the translation unit. */
|
|
|
|
|
int initializations_p;
|
|
|
|
|
/* Non-zero if there have been any destructions at this priority
|
|
|
|
|
throughout the translation unit. */
|
|
|
|
|
int destructions_p;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
} *priority_info;
|
|
|
|
|
|
2000-01-26 21:51:37 +01:00
|
|
|
|
static void mark_vtable_entries PARAMS ((tree));
|
|
|
|
|
static void grok_function_init PARAMS ((tree, tree));
|
|
|
|
|
static int finish_vtable_vardecl PARAMS ((tree *, void *));
|
|
|
|
|
static int prune_vtable_vardecl PARAMS ((tree *, void *));
|
|
|
|
|
static int is_namespace_ancestor PARAMS ((tree, tree));
|
|
|
|
|
static void add_using_namespace PARAMS ((tree, tree, int));
|
|
|
|
|
static tree ambiguous_decl PARAMS ((tree, tree, tree,int));
|
|
|
|
|
static tree build_anon_union_vars PARAMS ((tree, tree*, int, int));
|
|
|
|
|
static int acceptable_java_type PARAMS ((tree));
|
|
|
|
|
static void output_vtable_inherit PARAMS ((tree));
|
|
|
|
|
static tree start_objects PARAMS ((int, int));
|
|
|
|
|
static void finish_objects PARAMS ((int, int, tree));
|
|
|
|
|
static tree merge_functions PARAMS ((tree, tree));
|
|
|
|
|
static tree decl_namespace PARAMS ((tree));
|
|
|
|
|
static tree validate_nonmember_using_decl PARAMS ((tree, tree *, tree *));
|
|
|
|
|
static void do_nonmember_using_decl PARAMS ((tree, tree, tree, tree,
|
Warning fixes:
* call.c (op_error): Const-ify a char*.
(add_candidate, source_type, add_warning): Add static prototype.
(print_z_candidates): Const-ify a char*.
* class.c (resolve_address_of_overloaded_function,
fixed_type_or_null, build_vtable_entry_ref): Add static prototype.
(get_vtable_name, finish_struct_1): Const-ify a char*.
* cvt.c (convert_to_reference): Likewise.
* decl.c (redeclaration_error_message, record_builtin_type,
record_unknown_type, member_function_or_else, bad_specifiers):
Likewise.
(find_binding, select_decl, unqualified_namespace_lookup,
lookup_flags, qualify_lookup, record_builtin_java_type, tag_name):
Add static prototype.
(warn_extern_redeclared_static, duplicate_decls, pushdecl,
implicitly_declare, record_builtin_java_type, define_function,
grok_op_properties, tag_name): Const-ify a char*.
* cp-tree.h (FORMAT_VBASE_NAME): Allow parameter `BUF' to be const.
(define_function, finish_builtin_type): Const-ify a char*.
(cp_error, cp_error_at, cp_warning, cp_warning_at, cp_pedwarn,
cp_pedwarn_at, cp_compiler_error, cp_sprintf): Add prototype args.
(file_name_nondirectory): Const-ify a char*.
(init_filename_times): Don't prototype.
(compiler_error): Prototype.
(yyerror, init_repo): Const-ify a char*.
(build_srcloc): Don't prototype.
(build_x_indirect_ref, build_indirect_ref, build_component_addr):
Const-ify a char*.
(warn_for_assignment): Don't prototype.
(convert_for_initialization, readonly_error, check_for_new_type,
GNU_xref_begin, GNU_xref_file, GNU_xref_ref, GNU_xref_call):
Const-ify a char*.
* decl2.c (acceptable_java_type, output_vtable_inherit,
setup_initp, start_objects, finish_objects, do_dtors, do_ctors,
merge_functions, decl_namespace, validate_nonmember_using_decl,
do_nonmember_using_decl): Add static prototype.
(lang_f_options): Const-ify a char*.
(finish_builtin_type): Likewise.
(add_function, arg_assoc_namespace, arg_assoc_class): Add static
prototype.
* errfn.c: Include cp-tree.h.
(cp_thing): Add static prototype.
(compiler_error): Don't protoptype.
(cp_compiler_error): Cast `compiler_error' to `errorfn' before
passing it to `cp_thing'.
* error.c (interesting_scope_p): Add static prototype.
* except.c (build_eh_type_type, build_eh_type_type_ref): Const-ify
a char*.
* init.c (compiler_error): Don't prototype.
(member_init_ok_or_else): Const-ify a char*.
(build_java_class_ref): Add static prototype.
* lex.c (compiler_error): Don't prototype.
(get_time_identifier, interface_strcmp, extend_token_buffer,
handle_cp_pragma): Const-ify a char*.
(is_global, init_filename_times): Add static prototype.
(file_name_nondirectory, cplus_tree_code_name): Const-ify a char*.
(compiler_error): Change from fixed args to variable args.
(yyerror): Const-ify a char*.
* parse.y (cond_stmt_keyword): Const-ify a char*.
(parse_decl): Add static prototype.
* pt.c (template_args_equal, print_template_context): Likewise.
(print_candidates, check_default_tmpl_args): Const-ify a char*.
(instantiate_class_template): Likewise.
* repo.c (get_base_filename, open_repo_file, init_repo): Likewise.
* rtti.c (call_void_fn, expand_generic_desc, expand_si_desc,
expand_class_desc, expand_ptr_desc, expand_attr_desc): Likewise.
* search.c (lookup_field_info, lookup_member): Likewise.
(lookup_member): Cast the first argument of `bzero' to a PTR.
* sig.c (compiler_error): Don't prototype.
(build_signature_pointer_or_reference_nam): Const-ify a char*.
(get_sigtable_name, build_member_function_pointer): Likewise.
* tree.c (compiler_error): Don't prototype.
(no_linkage_helper, build_srcloc): Add static prototype.
(build_vbase_pointer_fields): Const-ify a char*.
(__eprintf): Don't unnecessarily handle `const' when !__STDC__.
* typeck.c (compiler_error): Don't prototype.
(convert_for_assignment): Const-ify a char*.
(comp_cv_target_types): Add static prototype.
(build_x_indirect_ref, build_indirect_ref, convert_arguments,
build_component_addr, build_unary_op, convert_for_initialization):
Const-ify a char*.
* typeck2.c (ack): Add static prototype and change from fixed args
to variable args.
(readonly_error, check_for_new_type): Const-ify a char*.
* xref.c (_XREF_FILE, find_file, filename, fctname, declname,
fixname, open_xref_file, classname, GNU_xref_begin): Likewise.
(GNU_xref_file): Likewise. Also use `xmalloc' instead of `malloc'.
(GNU_xref_end_scope, GNU_xref_ref, GNU_xref_decl, GNU_xref_call,
gen_assign, GNU_xref_member): Const-ify a char*.
From-SVN: r25994
1999-03-26 08:45:00 +01:00
|
|
|
|
tree *, tree *));
|
2000-01-26 21:51:37 +01:00
|
|
|
|
static tree start_static_storage_duration_function PARAMS ((void));
|
|
|
|
|
static void finish_static_storage_duration_function PARAMS ((tree));
|
|
|
|
|
static priority_info get_priority_info PARAMS ((int));
|
|
|
|
|
static void do_static_initialization PARAMS ((tree, tree));
|
|
|
|
|
static void do_static_destruction PARAMS ((tree));
|
|
|
|
|
static tree start_static_initialization_or_destruction PARAMS ((tree, int));
|
|
|
|
|
static void finish_static_initialization_or_destruction PARAMS ((tree));
|
|
|
|
|
static void generate_ctor_or_dtor_function PARAMS ((int, int));
|
1999-04-23 01:13:12 +02:00
|
|
|
|
static int generate_ctor_and_dtor_functions_for_priority
|
2000-01-26 21:51:37 +01:00
|
|
|
|
PARAMS ((splay_tree_node, void *));
|
|
|
|
|
static tree prune_vars_needing_no_initialization PARAMS ((tree));
|
|
|
|
|
static void write_out_vars PARAMS ((tree));
|
2000-02-27 03:46:57 +01:00
|
|
|
|
static void import_export_class PARAMS ((tree));
|
2000-03-04 01:45:24 +01:00
|
|
|
|
static tree key_method PARAMS ((tree));
|
2000-05-31 21:27:12 +02:00
|
|
|
|
static int compare_options PARAMS ((const PTR, const PTR));
|
2000-06-30 09:16:35 +02:00
|
|
|
|
static tree get_guard_bits PARAMS ((tree));
|
1999-09-30 17:48:19 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* A list of static class variables. This is needed, because a
|
|
|
|
|
static class variable can be declared inside the class without
|
2001-10-28 20:25:00 +01:00
|
|
|
|
an initializer, and then initialized, statically, outside the class. */
|
2002-06-04 09:11:05 +02:00
|
|
|
|
static GTY(()) varray_type pending_statics;
|
1999-12-05 01:37:56 +01:00
|
|
|
|
#define pending_statics_used \
|
|
|
|
|
(pending_statics ? pending_statics->elements_used : 0)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1994-04-08 08:08:43 +02:00
|
|
|
|
/* A list of functions which were declared inline, but which we
|
1996-07-11 03:13:25 +02:00
|
|
|
|
may need to emit outline anyway. */
|
2002-06-04 09:11:05 +02:00
|
|
|
|
static GTY(()) varray_type deferred_fns;
|
2000-04-06 18:30:45 +02:00
|
|
|
|
#define deferred_fns_used \
|
|
|
|
|
(deferred_fns ? deferred_fns->elements_used : 0)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1994-03-24 00:33:53 +01:00
|
|
|
|
/* Flag used when debugging spew.c */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
extern int spew_debug;
|
1995-01-24 09:19:58 +01:00
|
|
|
|
|
1996-02-28 23:01:56 +01:00
|
|
|
|
/* Nonzero if we're done parsing and into end-of-file activities. */
|
|
|
|
|
|
|
|
|
|
int at_eof;
|
|
|
|
|
|
1995-01-24 09:19:58 +01:00
|
|
|
|
/* Functions called along with real static constructors and destructors. */
|
|
|
|
|
|
2000-09-12 08:46:00 +02:00
|
|
|
|
tree static_ctors;
|
|
|
|
|
tree static_dtors;
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
|
Get ready for garbage collection.
* Makefile.in (CXX_TREE_H): Add varray.h
(lex.o): Depend on ggc.h.
(decl.o): Likewise.
(decl2.o): Likewise.
(method.o): Likewise.
(search.o): Likewise.
(pt.o): Likewise.
(repo.o): Likewise.
* class.c: Include ggc.h.
(current_class_name): Remove.
(current_class_type): Likewise.
(current_access_specifier): Likewise.
(previous_class_type): Likewise.
(previous_class_values): Likewise.
(class_cache_firstobj): Likewise.
(current_lang_base): Likewise.
(current_lang_stack): Likewise.
(current_lang_stacksize): Likewise.
(lang_name_c): Likewise.
(lang_name_cplusplus): Likewise.
(lang_name_java): Likewise.
(current_lang_name): Likewise.
(base_layout_decl): Likewise.
(access_default_node): Likewise.
(access_public_node): Likewise.
(access_protected_node): Likewise.
(access_private_node): Likewise.
(access_default_virtual_node): Likewise.
(access_public_virtual_node): Likewise.
(access_protected_virtual_node): Likewise.
(access_private_virtual_node): Likewise.
(signed_zero_node): Likewise.
(init_class_processing): Don't build base_layout_decl.
(push_lang_context): Adjust now that current_lang_base is a varray.
(pop_lang_context): Likewise.
* cp-tree.h: Include varray.h.
(cp_global_trees): Add access_default, access_public,
access_protected, access_private, access_default_virtual,
access_public_virtual, access_protected_virtual,
access_private_virtual, ctor_identifier, delta2_identifier,
delta_identifier, dtor_identifier, in_charge_identifier,
index_identifier, nelts_identifier, this_identifier,
pfn_identifier, pfn_or_delta2_identifier, vptr_identifier,
lang_name_c, lang_name_cplusplus, lang_name_java,
empty_except_spec, null, jclass, minus_one, terminate.
(saved_scope): Move here from decl.c. Define globals in terms of
saved_scope: current_namespace, current_class_name,
current_class_type, current_access_specifier, current_lang_stack,
current_lang_base, current_lang_name, current_function_parms,
current_template_parms, processing_template_decl,
processing_specialization, processing_explicit_instantiation,
previous_class_type, previous_class_values, class_cache_firstobj.
(scope_chain): New variable.
(init_pt): New function.
* decl.c (current_namespace): Remove.
(this_identifier, in_charge_identifier, ctor_identifier): Likewise.
(dtor_identifier, pfn_identifier, index_identifier): Likewise.
(delta_identifier, delta2_identifier): Likewise.
(pfn_or_delta2_identifier, tag_identifier): Likewise
(vt_off_identifier, empty_except_spec, null_node): Likewise.
(current_function_parms, current_lang_base): Remove.
(current_lang_stack, previous_class_values): Remove.
(class_binding_level): Macroize.
(saved_scope): Remove.
(current_saved_scope): Rename to scope_chain.
(mark_saved_scope): Adjust for new scope structure.
(maybe_push_to_top_level): Likewise.
(pop_from_top_level): Likewise.
(duplicate_decls): Adjust now that current_lang_base is a varray.
(build_typename_type): Call ggc_add_tree_hash_table_root.
(init_decl_processing): Call init_pt. Call push_to_top_level to
set up globals. Add GC roots.
(xref_basetypes): Adjust now that current_lang_base is a varray.
* decl.h (this_identifier): Remove.
(in_charge_identifier): Likewise.
* decl2.c: Don't include varray.h.
(current_namespace): Remove.
(init_decl2): Add GC roots.
* except.c (Terminate): Remove.
(init_exception_processing): Use terminate_node instead.
(build_terminate_handler): Likewise.
* init.c (nc_nelts_field_id): Remove.
(minus_one): Likewise.
(init_init_processing): Use minus_one_node and nelts_identifier
instead. Add GC roots.
(jclass_node): Remove.
(build_new_1): Use nelts_identifier.
(build_vec_init): Likewise.
(build_vec_delete): Likewise.
* lex.c: Include ggc.h.
(defarg_fn): Move declaration early.
(defarg_parms): Likewise.
(init_parse): Add GC roots.
(handle_cp_pragma): Remove redundant declaration of
pending_vtables.
* method.c: Include ggc.h.
(btypelist): Make it a varray. All uses changed.
(ktypelist): Likewise.
(init_method): Add GC roots.
* pt.c: Don't include varray.h. Include ggc.h.
(current_template_parms): Remove.
(processing_template_decl): Likewise.
(processing_specialization): Likewise.
(processing_explicit_instantiation): Likewise.
(init_pt): New function.
* repo.c: Include ggc.h.
(init_repo): Add GC roots.
* search.c: Don't include varray.h.
(_vptr_name): Remove.
(lookup_field_1): Use vtpr_identifier instead.
(expand_indirect_vtbls_init): Remove redundant declaration of
in_charge_identifier.
(init_search_processing): Use vptr_identifier.
From-SVN: r29135
1999-09-06 04:43:09 +02:00
|
|
|
|
/* The :: namespace. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
|
|
|
|
|
tree global_namespace;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* C (and C++) language-specific option variables. */
|
|
|
|
|
|
|
|
|
|
/* Nonzero means don't recognize the keyword `asm'. */
|
|
|
|
|
|
|
|
|
|
int flag_no_asm;
|
|
|
|
|
|
1995-01-24 09:19:58 +01:00
|
|
|
|
/* Nonzero means don't recognize any extension keywords. */
|
|
|
|
|
|
|
|
|
|
int flag_no_gnu_keywords;
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Nonzero means to treat bitfields as unsigned unless they say `signed'. */
|
|
|
|
|
|
|
|
|
|
int flag_signed_bitfields = 1;
|
|
|
|
|
|
|
|
|
|
/* Nonzero means do emit exported implementations of functions even if
|
|
|
|
|
they can be inlined. */
|
|
|
|
|
|
|
|
|
|
int flag_implement_inlines = 1;
|
|
|
|
|
|
|
|
|
|
/* Nonzero means do emit exported implementations of templates, instead of
|
1996-07-11 03:13:25 +02:00
|
|
|
|
multiple static copies in each file that needs a definition. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1995-01-24 09:19:58 +01:00
|
|
|
|
int flag_external_templates;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Nonzero means that the decision to emit or not emit the implementation of a
|
|
|
|
|
template depends on where the template is instantiated, rather than where
|
|
|
|
|
it is defined. */
|
|
|
|
|
|
1995-01-24 09:19:58 +01:00
|
|
|
|
int flag_alt_external_templates;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1994-06-03 23:42:31 +02:00
|
|
|
|
/* Nonzero means that implicit instantiations will be emitted if needed. */
|
|
|
|
|
|
|
|
|
|
int flag_implicit_templates = 1;
|
|
|
|
|
|
1998-10-04 00:53:37 +02:00
|
|
|
|
/* Nonzero means that implicit instantiations of inline templates will be
|
|
|
|
|
emitted if needed, even if instantiations of non-inline templates
|
|
|
|
|
aren't. */
|
|
|
|
|
|
|
|
|
|
int flag_implicit_inline_templates = 1;
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Nonzero means warn about implicit declarations. */
|
|
|
|
|
|
|
|
|
|
int warn_implicit = 1;
|
|
|
|
|
|
1998-07-08 14:16:05 +02:00
|
|
|
|
/* Nonzero means warn about usage of long long when `-pedantic'. */
|
|
|
|
|
|
|
|
|
|
int warn_long_long = 1;
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Nonzero means warn when all ctors or dtors are private, and the class
|
|
|
|
|
has no friends. */
|
|
|
|
|
|
|
|
|
|
int warn_ctor_dtor_privacy = 1;
|
|
|
|
|
|
1999-08-19 23:19:37 +02:00
|
|
|
|
/* Nonzero means generate separate instantiation control files and juggle
|
|
|
|
|
them at link time. */
|
1995-04-03 21:28:01 +02:00
|
|
|
|
|
|
|
|
|
int flag_use_repository;
|
|
|
|
|
|
1998-07-07 13:25:01 +02:00
|
|
|
|
/* Nonzero if we want to issue diagnostics that the standard says are not
|
|
|
|
|
required. */
|
|
|
|
|
|
|
|
|
|
int flag_optional_diags = 1;
|
|
|
|
|
|
1998-08-24 04:08:45 +02:00
|
|
|
|
/* Nonzero means give string constants the type `const char *', as mandated
|
|
|
|
|
by the standard. */
|
|
|
|
|
|
|
|
|
|
int flag_const_strings = 1;
|
|
|
|
|
|
|
|
|
|
/* Nonzero means warn about deprecated conversion from string constant to
|
|
|
|
|
`char *'. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
int warn_write_strings;
|
|
|
|
|
|
|
|
|
|
/* Nonzero means warn about pointer casts that can drop a type qualifier
|
|
|
|
|
from the pointer target type. */
|
|
|
|
|
|
|
|
|
|
int warn_cast_qual;
|
|
|
|
|
|
|
|
|
|
/* Nonzero means warn about sizeof(function) or addition/subtraction
|
|
|
|
|
of function pointers. */
|
|
|
|
|
|
1996-01-17 19:57:55 +01:00
|
|
|
|
int warn_pointer_arith = 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Nonzero means warn for any function def without prototype decl. */
|
|
|
|
|
|
|
|
|
|
int warn_missing_prototypes;
|
|
|
|
|
|
|
|
|
|
/* Nonzero means warn about multiple (redundant) decls for the same single
|
|
|
|
|
variable or function. */
|
|
|
|
|
|
|
|
|
|
int warn_redundant_decls;
|
|
|
|
|
|
|
|
|
|
/* Warn if initializer is not completely bracketed. */
|
|
|
|
|
|
|
|
|
|
int warn_missing_braces;
|
|
|
|
|
|
1996-02-09 23:43:25 +01:00
|
|
|
|
/* Warn about comparison of signed and unsigned values. */
|
|
|
|
|
|
|
|
|
|
int warn_sign_compare;
|
|
|
|
|
|
1999-09-30 08:15:53 +02:00
|
|
|
|
/* Warn about testing equality of floating point numbers. */
|
|
|
|
|
|
|
|
|
|
int warn_float_equal = 0;
|
|
|
|
|
|
2000-10-17 08:52:06 +02:00
|
|
|
|
/* Warn about functions which might be candidates for format attributes. */
|
|
|
|
|
|
|
|
|
|
int warn_missing_format_attribute;
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Warn about a subscript that has type char. */
|
|
|
|
|
|
|
|
|
|
int warn_char_subscripts;
|
|
|
|
|
|
|
|
|
|
/* Warn if a type conversion is done that might have confusing results. */
|
|
|
|
|
|
|
|
|
|
int warn_conversion;
|
|
|
|
|
|
|
|
|
|
/* Warn if adding () is suggested. */
|
|
|
|
|
|
1995-01-24 09:19:58 +01:00
|
|
|
|
int warn_parentheses;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Non-zero means warn in function declared in derived class has the
|
|
|
|
|
same name as a virtual in the base class, but fails to match the
|
|
|
|
|
type signature of any virtual function in the base class. */
|
2001-01-03 02:11:18 +01:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
int warn_overloaded_virtual;
|
|
|
|
|
|
|
|
|
|
/* Non-zero means warn when declaring a class that has a non virtual
|
1996-07-11 03:13:25 +02:00
|
|
|
|
destructor, when it really ought to have a virtual one. */
|
2001-01-03 02:11:18 +01:00
|
|
|
|
|
1994-07-06 02:28:23 +02:00
|
|
|
|
int warn_nonvdtor;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1994-09-26 21:15:18 +01:00
|
|
|
|
/* Non-zero means warn when the compiler will reorder code. */
|
2001-01-03 02:11:18 +01:00
|
|
|
|
|
1994-09-26 21:15:18 +01:00
|
|
|
|
int warn_reorder;
|
|
|
|
|
|
1995-05-16 14:14:26 +02:00
|
|
|
|
/* Non-zero means warn when synthesis behavior differs from Cfront's. */
|
2001-01-03 02:11:18 +01:00
|
|
|
|
|
1994-09-26 21:15:18 +01:00
|
|
|
|
int warn_synth;
|
|
|
|
|
|
1996-11-12 20:49:48 +01:00
|
|
|
|
/* Non-zero means warn when we convert a pointer to member function
|
|
|
|
|
into a pointer to (void or function). */
|
2001-01-03 02:11:18 +01:00
|
|
|
|
|
1996-11-12 20:49:48 +01:00
|
|
|
|
int warn_pmf2ptr = 1;
|
|
|
|
|
|
1997-05-02 03:42:58 +02:00
|
|
|
|
/* Nonzero means warn about violation of some Effective C++ style rules. */
|
|
|
|
|
|
1997-08-20 00:37:19 +02:00
|
|
|
|
int warn_ecpp;
|
|
|
|
|
|
|
|
|
|
/* Nonzero means warn where overload resolution chooses a promotion from
|
|
|
|
|
unsigned to signed over a conversion to an unsigned of the same size. */
|
|
|
|
|
|
|
|
|
|
int warn_sign_promo;
|
1997-05-02 03:42:58 +02:00
|
|
|
|
|
1997-09-29 21:05:04 +02:00
|
|
|
|
/* Nonzero means warn when an old-style cast is used. */
|
|
|
|
|
|
|
|
|
|
int warn_old_style_cast;
|
|
|
|
|
|
1997-12-21 16:22:02 +01:00
|
|
|
|
/* Warn about #pragma directives that are not recognised. */
|
|
|
|
|
|
1998-07-07 13:25:01 +02:00
|
|
|
|
int warn_unknown_pragmas; /* Tri state variable. */
|
|
|
|
|
|
1998-09-03 18:10:00 +02:00
|
|
|
|
/* Nonzero means warn when non-templatized friend functions are
|
|
|
|
|
declared within a template */
|
|
|
|
|
|
|
|
|
|
int warn_nontemplate_friend = 1;
|
|
|
|
|
|
1999-04-14 07:34:55 +02:00
|
|
|
|
/* Nonzero means complain about deprecated features. */
|
|
|
|
|
|
|
|
|
|
int warn_deprecated = 1;
|
|
|
|
|
|
1997-09-30 07:32:19 +02:00
|
|
|
|
/* Nonzero means `$' can be in an identifier. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
#ifndef DOLLARS_IN_IDENTIFIERS
|
|
|
|
|
#define DOLLARS_IN_IDENTIFIERS 1
|
|
|
|
|
#endif
|
|
|
|
|
int dollars_in_ident = DOLLARS_IN_IDENTIFIERS;
|
|
|
|
|
|
|
|
|
|
/* C++ specific flags. */
|
|
|
|
|
|
1998-08-27 21:03:59 +02:00
|
|
|
|
/* Nonzero means we should attempt to elide constructors when possible. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1998-08-27 21:03:59 +02:00
|
|
|
|
int flag_elide_constructors = 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Nonzero means that member functions defined in class scope are
|
|
|
|
|
inline by default. */
|
|
|
|
|
|
|
|
|
|
int flag_default_inline = 1;
|
|
|
|
|
|
1994-11-29 01:59:16 +01:00
|
|
|
|
/* Controls whether compiler generates 'type descriptor' that give
|
1994-02-24 02:02:37 +01:00
|
|
|
|
run-time type information. */
|
2001-01-03 02:11:18 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
int flag_rtti = 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Nonzero if we want to support huge (> 2^(sizeof(short)*8-1) bytes)
|
1996-07-11 03:13:25 +02:00
|
|
|
|
objects. */
|
1995-01-24 09:19:58 +01:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
int flag_huge_objects;
|
|
|
|
|
|
|
|
|
|
/* Nonzero if we want to conserve space in the .o files. We do this
|
|
|
|
|
by putting uninitialized data and runtime initialized data into
|
1995-05-16 14:14:26 +02:00
|
|
|
|
.common instead of .data at the expense of not flagging multiple
|
1994-02-24 02:02:37 +01:00
|
|
|
|
definitions. */
|
1995-01-24 09:19:58 +01:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
int flag_conserve_space;
|
|
|
|
|
|
1994-10-27 02:22:58 +01:00
|
|
|
|
/* Nonzero if we want to obey access control semantics. */
|
1995-01-24 09:19:58 +01:00
|
|
|
|
|
1994-10-27 02:22:58 +01:00
|
|
|
|
int flag_access_control = 1;
|
|
|
|
|
|
1995-01-24 09:19:58 +01:00
|
|
|
|
/* Nonzero if we want to understand the operator names, i.e. 'bitand'. */
|
|
|
|
|
|
2000-04-10 09:48:15 +02:00
|
|
|
|
int flag_operator_names = 1;
|
1995-01-24 09:19:58 +01:00
|
|
|
|
|
1995-01-31 23:18:02 +01:00
|
|
|
|
/* Nonzero if we want to check the return value of new and avoid calling
|
|
|
|
|
constructors if it is a null pointer. */
|
|
|
|
|
|
|
|
|
|
int flag_check_new;
|
|
|
|
|
|
Refer to the standard as an ISO document, not an ANSI one.
* decl.c (grokdeclarator): Change ANSI to ISO.
* lex.c (consume_string, readescape, do_identifier): Likewise.
(parse_float, real_yylex): Likewise.
* parse.y (paren_expr_or_null, paren_cond_or_null): Likewise.
(unary_expr, new_initializer, cast_expr, primary, primary_no_id,
new_type_id, maybe_label_decls, simple_stmt,
for.init.statement): Likewise.
* pt.c (do_decl_instantiation, do_type_instantiation): Likewise.
* semantics.c (finish_named_return_value): Likewise.
* parse.c: Regenerate.
From-SVN: r32100
2000-02-22 08:25:31 +01:00
|
|
|
|
/* Nonzero if we want the new ISO rules for pushing a new scope for `for'
|
1995-08-26 01:04:48 +02:00
|
|
|
|
initialization variables.
|
|
|
|
|
0: Old rules, set by -fno-for-scope.
|
Refer to the standard as an ISO document, not an ANSI one.
* decl.c (grokdeclarator): Change ANSI to ISO.
* lex.c (consume_string, readescape, do_identifier): Likewise.
(parse_float, real_yylex): Likewise.
* parse.y (paren_expr_or_null, paren_cond_or_null): Likewise.
(unary_expr, new_initializer, cast_expr, primary, primary_no_id,
new_type_id, maybe_label_decls, simple_stmt,
for.init.statement): Likewise.
* pt.c (do_decl_instantiation, do_type_instantiation): Likewise.
* semantics.c (finish_named_return_value): Likewise.
* parse.c: Regenerate.
From-SVN: r32100
2000-02-22 08:25:31 +01:00
|
|
|
|
2: New ISO rules, set by -ffor-scope.
|
|
|
|
|
1: Try to implement new ISO rules, but with backup compatibility
|
1995-08-26 01:04:48 +02:00
|
|
|
|
(and warnings). This is the default, for now. */
|
1995-05-10 04:58:06 +02:00
|
|
|
|
|
|
|
|
|
int flag_new_for_scope = 1;
|
|
|
|
|
|
1995-12-19 07:51:14 +01:00
|
|
|
|
/* Nonzero if we want to emit defined symbols with common-like linkage as
|
|
|
|
|
weak symbols where possible, in order to conform to C++ semantics.
|
|
|
|
|
Otherwise, emit them as local symbols. */
|
|
|
|
|
|
|
|
|
|
int flag_weak = 1;
|
|
|
|
|
|
1999-12-17 08:40:08 +01:00
|
|
|
|
/* Nonzero to use __cxa_atexit, rather than atexit, to register
|
|
|
|
|
destructors for local statics and global objects. */
|
|
|
|
|
|
2002-06-07 19:14:56 +02:00
|
|
|
|
int flag_use_cxa_atexit = DEFAULT_USE_CXA_ATEXIT;
|
1999-12-17 08:40:08 +01:00
|
|
|
|
|
2001-01-03 02:11:18 +01:00
|
|
|
|
/* Maximum template instantiation depth. This limit is rather
|
|
|
|
|
arbitrary, but it exists to limit the time it takes to notice
|
|
|
|
|
infinite template instantiations. */
|
1997-02-12 21:23:55 +01:00
|
|
|
|
|
2002-01-10 15:56:50 +01:00
|
|
|
|
int max_tinst_depth = 500;
|
1997-02-12 21:23:55 +01:00
|
|
|
|
|
1998-08-28 18:11:35 +02:00
|
|
|
|
/* Nonzero means output .vtable_{entry,inherit} for use in doing vtable gc. */
|
|
|
|
|
|
|
|
|
|
int flag_vtable_gc;
|
1998-02-10 13:31:27 +01:00
|
|
|
|
|
1998-12-07 13:27:47 +01:00
|
|
|
|
/* Nonzero means make the default pedwarns warnings instead of errors.
|
|
|
|
|
The value of this flag is ignored if -pedantic is specified. */
|
|
|
|
|
|
|
|
|
|
int flag_permissive;
|
|
|
|
|
|
2000-03-10 12:56:00 +01:00
|
|
|
|
/* Nonzero means to implement standard semantics for exception
|
|
|
|
|
specifications, calling unexpected if an exception is thrown that
|
|
|
|
|
doesn't match the specification. Zero means to treat them as
|
|
|
|
|
assertions and optimize accordingly, but not check them. */
|
|
|
|
|
|
|
|
|
|
int flag_enforce_eh_specs = 1;
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Table of language-dependent -f options.
|
|
|
|
|
STRING is the option name. VARIABLE is the address of the variable.
|
|
|
|
|
ON_VALUE is the value to store in VARIABLE
|
|
|
|
|
if `-fSTRING' is seen as an option.
|
|
|
|
|
(If `-fno-STRING' is seen as an option, the opposite value is stored.) */
|
|
|
|
|
|
arc.c (arc_hard_regno_mode_ok): Const-ify.
* arc.c (arc_hard_regno_mode_ok): Const-ify.
* arc.h (arc_hard_regno_mode_ok): Likewise.
* i386.c (x86_64_reg_class_name): Make static.
* m68k.c (regno_reg_class): Const-ify.
* m68k.h (regno_reg_class): Likewise.
* mcore.c (reg_class_from_letter): Likewise.
* mcore.h (reg_class_from_letter): Likewise.
* sh.c (reg_class_from_letter, ashiftrt_insns, shift_insns,
ext_shift_insns, ext_shift_amounts): Likewise.
* sh.h (reg_class_from_letter): Likewise.
* sparc.c (hard_regno_mode_classes, hard_32bit_mode_classes,
hard_64bit_mode_classes): Likewise.
* sparc.h (hard_regno_mode_classes): Likewise.
* gcc.c (modify_target): Make static.
* gengenrtl.c (defs, formats): Likewise.
* reload1.c (elim_table_1, init_elim_table): Const-ify.
* tradcpp.c (directive, directive_table, handle_directive,
skip_if_group, run_directive): Likewise.
cp:
* decl2.c (lang_f_options): Const-ify.
f:
* com.c (ffecom_gfrt_volatile_, ffecom_gfrt_complex_,
ffecom_gfrt_const_, ffecom_gfrt_type_): Const-ify.
java:
* Make-lang.in (keyword.h): Pass -C to gperf to const-ify
the static arrays that are output.
* jvspec.c (jvgenmain_spec): Make static.
* keyword.gperf (struct java_keyword, java_keyword): Const-ify.
* keyword.h: Regenerate.
* lang.c (string_option, process_option_with_no, lang_f_options,
lang_W_options): Const-ify.
* lex.c (java_lex): Likewise.
From-SVN: r48290
2001-12-23 17:07:16 +01:00
|
|
|
|
static const struct { const char *const string; int *const variable; const int on_value;}
|
Warning fixes:
* call.c (op_error): Const-ify a char*.
(add_candidate, source_type, add_warning): Add static prototype.
(print_z_candidates): Const-ify a char*.
* class.c (resolve_address_of_overloaded_function,
fixed_type_or_null, build_vtable_entry_ref): Add static prototype.
(get_vtable_name, finish_struct_1): Const-ify a char*.
* cvt.c (convert_to_reference): Likewise.
* decl.c (redeclaration_error_message, record_builtin_type,
record_unknown_type, member_function_or_else, bad_specifiers):
Likewise.
(find_binding, select_decl, unqualified_namespace_lookup,
lookup_flags, qualify_lookup, record_builtin_java_type, tag_name):
Add static prototype.
(warn_extern_redeclared_static, duplicate_decls, pushdecl,
implicitly_declare, record_builtin_java_type, define_function,
grok_op_properties, tag_name): Const-ify a char*.
* cp-tree.h (FORMAT_VBASE_NAME): Allow parameter `BUF' to be const.
(define_function, finish_builtin_type): Const-ify a char*.
(cp_error, cp_error_at, cp_warning, cp_warning_at, cp_pedwarn,
cp_pedwarn_at, cp_compiler_error, cp_sprintf): Add prototype args.
(file_name_nondirectory): Const-ify a char*.
(init_filename_times): Don't prototype.
(compiler_error): Prototype.
(yyerror, init_repo): Const-ify a char*.
(build_srcloc): Don't prototype.
(build_x_indirect_ref, build_indirect_ref, build_component_addr):
Const-ify a char*.
(warn_for_assignment): Don't prototype.
(convert_for_initialization, readonly_error, check_for_new_type,
GNU_xref_begin, GNU_xref_file, GNU_xref_ref, GNU_xref_call):
Const-ify a char*.
* decl2.c (acceptable_java_type, output_vtable_inherit,
setup_initp, start_objects, finish_objects, do_dtors, do_ctors,
merge_functions, decl_namespace, validate_nonmember_using_decl,
do_nonmember_using_decl): Add static prototype.
(lang_f_options): Const-ify a char*.
(finish_builtin_type): Likewise.
(add_function, arg_assoc_namespace, arg_assoc_class): Add static
prototype.
* errfn.c: Include cp-tree.h.
(cp_thing): Add static prototype.
(compiler_error): Don't protoptype.
(cp_compiler_error): Cast `compiler_error' to `errorfn' before
passing it to `cp_thing'.
* error.c (interesting_scope_p): Add static prototype.
* except.c (build_eh_type_type, build_eh_type_type_ref): Const-ify
a char*.
* init.c (compiler_error): Don't prototype.
(member_init_ok_or_else): Const-ify a char*.
(build_java_class_ref): Add static prototype.
* lex.c (compiler_error): Don't prototype.
(get_time_identifier, interface_strcmp, extend_token_buffer,
handle_cp_pragma): Const-ify a char*.
(is_global, init_filename_times): Add static prototype.
(file_name_nondirectory, cplus_tree_code_name): Const-ify a char*.
(compiler_error): Change from fixed args to variable args.
(yyerror): Const-ify a char*.
* parse.y (cond_stmt_keyword): Const-ify a char*.
(parse_decl): Add static prototype.
* pt.c (template_args_equal, print_template_context): Likewise.
(print_candidates, check_default_tmpl_args): Const-ify a char*.
(instantiate_class_template): Likewise.
* repo.c (get_base_filename, open_repo_file, init_repo): Likewise.
* rtti.c (call_void_fn, expand_generic_desc, expand_si_desc,
expand_class_desc, expand_ptr_desc, expand_attr_desc): Likewise.
* search.c (lookup_field_info, lookup_member): Likewise.
(lookup_member): Cast the first argument of `bzero' to a PTR.
* sig.c (compiler_error): Don't prototype.
(build_signature_pointer_or_reference_nam): Const-ify a char*.
(get_sigtable_name, build_member_function_pointer): Likewise.
* tree.c (compiler_error): Don't prototype.
(no_linkage_helper, build_srcloc): Add static prototype.
(build_vbase_pointer_fields): Const-ify a char*.
(__eprintf): Don't unnecessarily handle `const' when !__STDC__.
* typeck.c (compiler_error): Don't prototype.
(convert_for_assignment): Const-ify a char*.
(comp_cv_target_types): Add static prototype.
(build_x_indirect_ref, build_indirect_ref, convert_arguments,
build_component_addr, build_unary_op, convert_for_initialization):
Const-ify a char*.
* typeck2.c (ack): Add static prototype and change from fixed args
to variable args.
(readonly_error, check_for_new_type): Const-ify a char*.
* xref.c (_XREF_FILE, find_file, filename, fctname, declname,
fixname, open_xref_file, classname, GNU_xref_begin): Likewise.
(GNU_xref_file): Likewise. Also use `xmalloc' instead of `malloc'.
(GNU_xref_end_scope, GNU_xref_ref, GNU_xref_decl, GNU_xref_call,
gen_assign, GNU_xref_member): Const-ify a char*.
From-SVN: r25994
1999-03-26 08:45:00 +01:00
|
|
|
|
lang_f_options[] =
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1998-12-06 02:44:12 +01:00
|
|
|
|
/* C/C++ options. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{"signed-char", &flag_signed_char, 1},
|
|
|
|
|
{"unsigned-char", &flag_signed_char, 0},
|
|
|
|
|
{"signed-bitfields", &flag_signed_bitfields, 1},
|
|
|
|
|
{"unsigned-bitfields", &flag_signed_bitfields, 0},
|
|
|
|
|
{"short-enums", &flag_short_enums, 1},
|
|
|
|
|
{"short-double", &flag_short_double, 1},
|
1999-09-23 23:04:10 +02:00
|
|
|
|
{"short-wchar", &flag_short_wchar, 1},
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{"asm", &flag_no_asm, 0},
|
|
|
|
|
{"builtin", &flag_no_builtin, 0},
|
1998-12-06 02:44:12 +01:00
|
|
|
|
|
|
|
|
|
/* C++-only options. */
|
|
|
|
|
{"access-control", &flag_access_control, 1},
|
|
|
|
|
{"check-new", &flag_check_new, 1},
|
|
|
|
|
{"conserve-space", &flag_conserve_space, 1},
|
1998-08-24 04:08:45 +02:00
|
|
|
|
{"const-strings", &flag_const_strings, 1},
|
1998-12-06 02:44:12 +01:00
|
|
|
|
{"default-inline", &flag_default_inline, 1},
|
|
|
|
|
{"dollars-in-identifiers", &dollars_in_ident, 1},
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{"elide-constructors", &flag_elide_constructors, 1},
|
2000-03-10 12:56:00 +01:00
|
|
|
|
{"enforce-eh-specs", &flag_enforce_eh_specs, 1},
|
1998-12-06 02:44:12 +01:00
|
|
|
|
{"external-templates", &flag_external_templates, 1},
|
|
|
|
|
{"for-scope", &flag_new_for_scope, 2},
|
|
|
|
|
{"gnu-keywords", &flag_no_gnu_keywords, 0},
|
1997-08-20 00:37:19 +02:00
|
|
|
|
{"handle-exceptions", &flag_exceptions, 1},
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{"implement-inlines", &flag_implement_inlines, 1},
|
1998-10-04 00:53:37 +02:00
|
|
|
|
{"implicit-inline-templates", &flag_implicit_inline_templates, 1},
|
1998-12-06 02:44:12 +01:00
|
|
|
|
{"implicit-templates", &flag_implicit_templates, 1},
|
1999-08-12 08:52:30 +02:00
|
|
|
|
{"ms-extensions", &flag_ms_extensions, 1},
|
1995-01-24 09:19:58 +01:00
|
|
|
|
{"nonansi-builtins", &flag_no_nonansi_builtin, 0},
|
1995-01-31 23:18:02 +01:00
|
|
|
|
{"operator-names", &flag_operator_names, 1},
|
1998-07-07 13:25:01 +02:00
|
|
|
|
{"optional-diags", &flag_optional_diags, 1},
|
1998-12-07 13:27:47 +01:00
|
|
|
|
{"permissive", &flag_permissive, 1},
|
1995-05-10 04:58:06 +02:00
|
|
|
|
{"repo", &flag_use_repository, 1},
|
1998-12-06 02:44:12 +01:00
|
|
|
|
{"rtti", &flag_rtti, 1},
|
|
|
|
|
{"stats", &flag_detailed_statistics, 1},
|
2001-05-21 17:55:40 +02:00
|
|
|
|
{"vtable-gc", &flag_vtable_gc, 1},
|
1999-12-17 08:40:08 +01:00
|
|
|
|
{"use-cxa-atexit", &flag_use_cxa_atexit, 1},
|
2001-04-26 22:05:34 +02:00
|
|
|
|
{"weak", &flag_weak, 1}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
};
|
|
|
|
|
|
2000-05-31 21:27:12 +02:00
|
|
|
|
/* The list of `-f' options that we no longer support. The `-f'
|
|
|
|
|
prefix is not given in this table. The `-fno-' variants are not
|
|
|
|
|
listed here. This table must be kept in alphabetical order. */
|
2000-06-01 11:40:07 +02:00
|
|
|
|
static const char * const unsupported_options[] = {
|
2000-05-31 21:27:12 +02:00
|
|
|
|
"all-virtual",
|
2001-01-10 11:57:17 +01:00
|
|
|
|
"cond-mismatch",
|
2000-05-31 21:27:12 +02:00
|
|
|
|
"enum-int-equiv",
|
2000-06-01 11:40:07 +02:00
|
|
|
|
"guiding-decls",
|
2001-08-02 12:51:17 +02:00
|
|
|
|
"honor-std",
|
2001-05-21 17:55:40 +02:00
|
|
|
|
"huge-objects",
|
2001-04-26 22:05:34 +02:00
|
|
|
|
"labels-ok",
|
2001-04-29 13:48:40 +02:00
|
|
|
|
"new-abi",
|
2000-05-31 21:27:12 +02:00
|
|
|
|
"nonnull-objects",
|
2001-02-18 21:31:44 +01:00
|
|
|
|
"squangle",
|
2000-07-25 22:19:24 +02:00
|
|
|
|
"strict-prototype",
|
2001-02-18 21:31:44 +01:00
|
|
|
|
"this-is-variable",
|
2001-05-21 17:55:40 +02:00
|
|
|
|
"vtable-thunks",
|
2001-04-26 22:05:34 +02:00
|
|
|
|
"xref"
|
2000-05-31 21:27:12 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Compare two option strings, pointed two by P1 and P2, for use with
|
|
|
|
|
bsearch. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
compare_options (p1, p2)
|
|
|
|
|
const PTR p1;
|
|
|
|
|
const PTR p2;
|
|
|
|
|
{
|
2000-06-11 06:29:49 +02:00
|
|
|
|
return strcmp (*((const char *const *) p1), *((const char *const *) p2));
|
2000-05-31 21:27:12 +02:00
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Decode the string P as a language-specific option.
|
1998-06-10 12:16:45 +02:00
|
|
|
|
Return the number of strings consumed for a valid option.
|
1999-09-20 16:26:59 +02:00
|
|
|
|
Otherwise return 0. Should not complain if it does not
|
|
|
|
|
recognise the option. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
int
|
2001-01-10 08:51:11 +01:00
|
|
|
|
cxx_decode_option (argc, argv)
|
2000-11-25 20:28:44 +01:00
|
|
|
|
int argc;
|
1998-06-10 12:16:45 +02:00
|
|
|
|
char **argv;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1998-06-10 12:16:45 +02:00
|
|
|
|
int strings_processed;
|
2000-05-31 21:27:12 +02:00
|
|
|
|
const char *p = argv[0];
|
2000-11-25 20:28:44 +01:00
|
|
|
|
|
2002-06-08 00:24:30 +02:00
|
|
|
|
strings_processed = cpp_handle_option (parse_in, argc, argv);
|
1998-06-10 12:16:45 +02:00
|
|
|
|
|
c-common.c, [...]: Delete code implementing -traditional mode.
* c-common.c, c-common.h, c-decl.c, c-lex.c, c-parse.in,
c-tree.h, c-typeck.c, cppexp.c, cpplex.c, cpplib.c, cpplib.h,
cppmacro.c, objc/lang-specs.h, objc/objc-act.c,
builtin-types.def, builtins.def, dwarf2out.c, dwarfout.c,
gcc.c, toplev.c: Delete code implementing -traditional mode.
* ada/misc.c, ch/ch-tree.h, ch/decl.c, cp/decl2.c, f/com.c,
f/lex.c, f/top.c, java/builtins.c, java/decl.c: Delete
traditional-mode-related code copied from the C front end
but not used, or used only to permit the compiler to link.
* doc/bugreport.texi, doc/cpp.texi, doc/extend.texi,
doc/invoke.texi, doc/standards.texi, doc/trouble.texi:
Document removal of -traditional mode for compilation, and
remove documentation only relevant to that mode.
* config/nextstep.h, config/ptx4.h, config/svr4.h,
config/convex/convex.h, config/d30v/d30v.h,
config/i386/dgux.h, config/i386/osf1elf.h,
config/i386/osfelf.h, config/i386/osfrose.h,
config/i386/sco5.h, config/i386/sol2.h, config/m68k/a-ux.h,
config/m68k/hp310.h, config/m88k/dgux.h,
config/m88k/dguxbcs.h, config/m88k/luna.h, config/m88k/m88k.c,
config/m88k/m88k.h, config/m88k/openbsd.h,
config/mips/abi64.h, config/mips/osfrose.h,
config/mips/svr4-5.h, config/mips/svr4-t.h,
config/sparc/sol2-sld-64.h, config/sparc/sol2.h,
config/stormy16/stormy16.h: Remove all references to
-traditional from target specs. Delete all mention of the
no-longer-necessary TRADITIONAL_RETURN_FLOAT macro. Also
delete a couple of commented-out definitions of
DOLLARS_IN_IDENTIFIERS, with (incorrect) commentary referring
to -traditional.
* system.h: Poison TRADITIONAL_RETURN_FLOAT.
* doc/tm.texi: Remove mention of TRADITIONAL_RETURN_FLOAT macro.
* testsuite/gcc.c-torture/execute/920730-1t.c,
testsuite/gcc.c-torture/execute/920730-1t.x,
testsuite/gcc.dg/ext-glob.c: Delete test cases, only relevant
to -traditional.
From-SVN: r50110
2002-02-27 19:48:07 +01:00
|
|
|
|
if (p[0] == '-' && p[1] == 'f')
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
/* Some kind of -f option.
|
|
|
|
|
P's value is the option sans `-f'.
|
|
|
|
|
Search for it in the table of options. */
|
2000-05-28 23:22:12 +02:00
|
|
|
|
const char *option_value = NULL;
|
2000-05-31 21:27:12 +02:00
|
|
|
|
const char *positive_option;
|
1998-03-12 01:02:51 +01:00
|
|
|
|
size_t j;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
p += 2;
|
|
|
|
|
/* Try special -f options. */
|
|
|
|
|
|
2000-05-31 21:27:12 +02:00
|
|
|
|
/* See if this is one of the options no longer supported. We
|
|
|
|
|
used to support these options, so we continue to accept them,
|
|
|
|
|
with a warning. */
|
|
|
|
|
if (strncmp (p, "no-", strlen ("no-")) == 0)
|
|
|
|
|
positive_option = p + strlen ("no-");
|
|
|
|
|
else
|
|
|
|
|
positive_option = p;
|
|
|
|
|
|
|
|
|
|
/* If the option is present, issue a warning. Indicate to our
|
|
|
|
|
caller that the option was processed successfully. */
|
|
|
|
|
if (bsearch (&positive_option,
|
|
|
|
|
unsupported_options,
|
attribs.c (init_attributes, [...]): Use ARRAY_SIZE in lieu of explicit sizeof/sizeof.
* attribs.c (init_attributes, decl_attributes): Use ARRAY_SIZE in
lieu of explicit sizeof/sizeof.
* i386.c (override_options, ix86_init_mmx_sse_builtins,
ix86_expand_builtin): Likewise.
* mips.c (mips_add_gc_roots): Likewise.
* mmix.c (mmix_output_condition): Likewise.
* rs6000.c (rs6000_override_options, altivec_expand_builtin,
altivec_init_builtins): Likewise.
* sparc.c (mark_ultrasparc_pipeline_state): Likewise.
* cppexp.c (Nsuff, parse_number): Likewise.
* cppinit.c (builtin_array_end): Likewise.
* gcc.c (n_default_compilers, process_command): Likewise.
* genpreds.c (output_predicate_decls): Likewise.
* ggc-page.c (NUM_EXTRA_ORDERS): Likewise.
* lcm.c (N_ENTITIES): Likewise.
* stor-layout.c (set_sizetype): Likewise.
ada:
* utils.c (init_gnat_to_gnu, init_gigi_decls): Use ARRAY_SIZE in
lieu of explicit sizeof/sizeof.
cp:
* decl.c (cxx_init_decl_processing): Use ARRAY_SIZE in lieu of
explicit sizeof/sizeof.
* decl2.c (cxx_decode_option): Likewise.
* lex.c (init_reswords, REDUCE_LENGTH, TOKEN_LENGTH): Likewise.
java:
* class.c (init_class_processing): Use ARRAY_SIZE in lieu of
explicit sizeof/sizeof.
* decl.c (java_init_decl_processing): Likewise.
* jcf-parse.c (init_jcf_parse): Likewise.
* parse.y (init_src_parse): Likewise.
From-SVN: r50255
2002-03-03 15:07:39 +01:00
|
|
|
|
ARRAY_SIZE (unsupported_options),
|
2000-06-01 11:40:07 +02:00
|
|
|
|
sizeof (unsupported_options[0]),
|
2000-05-31 21:27:12 +02:00
|
|
|
|
compare_options))
|
|
|
|
|
{
|
|
|
|
|
warning ("-f%s is no longer supported", p);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-21 04:07:01 +02:00
|
|
|
|
if (!strcmp (positive_option, "handle-exceptions"))
|
1998-09-07 16:25:35 +02:00
|
|
|
|
warning ("-fhandle-exceptions has been renamed to -fexceptions (and is now on by default)");
|
2002-07-21 04:07:01 +02:00
|
|
|
|
else if (!strcmp (p, "alt-external-templates"))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
flag_external_templates = 1;
|
|
|
|
|
flag_alt_external_templates = 1;
|
1999-04-14 07:34:55 +02:00
|
|
|
|
cp_deprecated ("-falt-external-templates");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
2002-07-21 04:07:01 +02:00
|
|
|
|
else if (!strcmp (p, "no-alt-external-templates"))
|
1999-09-21 22:19:18 +02:00
|
|
|
|
flag_alt_external_templates = 0;
|
1995-04-09 13:41:24 +02:00
|
|
|
|
else if (!strcmp (p, "repo"))
|
|
|
|
|
{
|
|
|
|
|
flag_use_repository = 1;
|
|
|
|
|
flag_implicit_templates = 0;
|
1994-08-18 22:50:43 +02:00
|
|
|
|
}
|
1999-04-14 07:34:55 +02:00
|
|
|
|
else if (!strcmp (p, "external-templates"))
|
|
|
|
|
{
|
|
|
|
|
flag_external_templates = 1;
|
|
|
|
|
cp_deprecated ("-fexternal-templates");
|
|
|
|
|
}
|
2000-05-28 23:22:12 +02:00
|
|
|
|
else if ((option_value
|
|
|
|
|
= skip_leading_substring (p, "template-depth-")))
|
1999-09-21 22:19:18 +02:00
|
|
|
|
max_tinst_depth
|
2000-05-28 23:22:12 +02:00
|
|
|
|
= read_integral_parameter (option_value, p - 2, max_tinst_depth);
|
|
|
|
|
else if ((option_value
|
|
|
|
|
= skip_leading_substring (p, "name-mangling-version-")))
|
2001-02-18 21:31:44 +01:00
|
|
|
|
{
|
|
|
|
|
warning ("-fname-mangling-version is no longer supported");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
c-common.h (flag_dump_translation_unit): Remove.
* c-common.h (flag_dump_translation_unit): Remove.
(enum tree_dump_index): Define.
(TDF_ADDRESS, TDF_SLIM): New #defines.
(dump_node_to_file): Remove.
(dump_node): Make extern. Add flags.
(dump_flag, dump_enabled_p, dump_begin, dump_end,
dump_switch_p): Prototype.
* c-common.c (flag_dump_translation_unit): Remove.
* c-decl.c (c_decode_option): Remove -fdump-translation-unit
logic. Use dump_switch_p.
* c-dump.h (struct dump_info): Add node and user fields.
(dump_pointer): Declare.
* c-dump.c (dump_node): Make extern. Add flags.
(SOL_COLUMN, EOL_COLUMN, COLUMN_ALIGNMENT): New #defines.
(dump_new_line, dump_maybe_newline): Use them.
(dump_pointer): New function.
(dequeue_and_dump): Check TDF_SLIM before dumping a _DECL's
chain or function's body. Dump address, if TDF_ADDRESS set.
(dump_flag): Define.
(dump_node_to_file): Remove.
(struct dump_file_info): New struct.
(dump_files): New array.
(dump_begin, dump_end, dump_enabled_p, dump_switch_p): Define.
* c-lang.c (finish_file): Adjust dumping.
* toplev.h (dump_base_name): Make extern.
* invoke.texi: Document new flags.
cp:
* class.c (maybe_indent_hierarchy): New function.
(dump_class_hierarchy_r): Add flags. Dump extra binfo
information, if enabled. Use maybe_indent_hierarchy. Adjust
output format.
(dump_class_hierarchy): Adjust prototype. Adjust output format.
(dump_array, dump_vtable, dump_vtt): New functions.
(finish_struct_1): Adjust hierarchy dumping.
(initialize_vtable): Call dump_vtable.
(build_vtt): Call dump_vtt.
(build_ctor_vtbl_group): Call dump_vtable.
* decl2.c (flag_dump_class_layout): Remove.
(cxx_decode_option): Remove dump translation unit
and dump class hierarchy check. Call dump_switch_p.
(finish_file): Adjust dumping.
(dump.c): Only dump base classes if not TDF_SLIM.
Only dump namespace members if not TDF_SLIM.
* optimize.c (dump_function): New function.
(optimize_function): Call dump_function.
* semantics.c (expand_body): Use dump_enabled_p.
From-SVN: r42896
2001-06-05 10:03:45 +02:00
|
|
|
|
else if (dump_switch_p (p))
|
|
|
|
|
;
|
1999-09-21 22:19:18 +02:00
|
|
|
|
else
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1999-09-21 22:19:18 +02:00
|
|
|
|
int found = 0;
|
|
|
|
|
|
attribs.c (init_attributes, [...]): Use ARRAY_SIZE in lieu of explicit sizeof/sizeof.
* attribs.c (init_attributes, decl_attributes): Use ARRAY_SIZE in
lieu of explicit sizeof/sizeof.
* i386.c (override_options, ix86_init_mmx_sse_builtins,
ix86_expand_builtin): Likewise.
* mips.c (mips_add_gc_roots): Likewise.
* mmix.c (mmix_output_condition): Likewise.
* rs6000.c (rs6000_override_options, altivec_expand_builtin,
altivec_init_builtins): Likewise.
* sparc.c (mark_ultrasparc_pipeline_state): Likewise.
* cppexp.c (Nsuff, parse_number): Likewise.
* cppinit.c (builtin_array_end): Likewise.
* gcc.c (n_default_compilers, process_command): Likewise.
* genpreds.c (output_predicate_decls): Likewise.
* ggc-page.c (NUM_EXTRA_ORDERS): Likewise.
* lcm.c (N_ENTITIES): Likewise.
* stor-layout.c (set_sizetype): Likewise.
ada:
* utils.c (init_gnat_to_gnu, init_gigi_decls): Use ARRAY_SIZE in
lieu of explicit sizeof/sizeof.
cp:
* decl.c (cxx_init_decl_processing): Use ARRAY_SIZE in lieu of
explicit sizeof/sizeof.
* decl2.c (cxx_decode_option): Likewise.
* lex.c (init_reswords, REDUCE_LENGTH, TOKEN_LENGTH): Likewise.
java:
* class.c (init_class_processing): Use ARRAY_SIZE in lieu of
explicit sizeof/sizeof.
* decl.c (java_init_decl_processing): Likewise.
* jcf-parse.c (init_jcf_parse): Likewise.
* parse.y (init_src_parse): Likewise.
From-SVN: r50255
2002-03-03 15:07:39 +01:00
|
|
|
|
for (j = 0; !found && j < ARRAY_SIZE (lang_f_options); j++)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1999-09-21 22:19:18 +02:00
|
|
|
|
if (!strcmp (p, lang_f_options[j].string))
|
|
|
|
|
{
|
|
|
|
|
*lang_f_options[j].variable = lang_f_options[j].on_value;
|
|
|
|
|
/* A goto here would be cleaner,
|
combine.c, [...]: consistently use "VAX", "VAXen", and "MicroVAX" in comments and documentation.
* combine.c, config.gcc, cse.c, defaults.h, real.c, reload.c,
simplify-rtx.c, config/alpha/alpha.h, config/avr/avr.h,
config/convex/convex.h, config/d30v/d30v.c,
config/d30v/d30v.h, config/dsp16xx/dsp16xx.h,
config/elxsi/elxsi.h, config/fr30/fr30.h, config/m88k/m88k.c,
config/mips/mips.h, config/mn10200/mn10200.h,
config/mn10300/mn10300.h, config/pdp11/pdp11.md,
config/v850/v850.h, config/vax/openbsd.h,
config/vax/openbsd1.h, config/vax/ultrix.h,
config/vax/vax-protos.h, config/vax/vax.c, config/vax/vax.h,
config/vax/vax.md, config/vax/vaxv.h, config/vax/xm-vms.h,
cp/decl2.c, doc/contrib.texi, doc/cpp.texi, doc/gcc.texi,
doc/install.texi, doc/invoke.texi, doc/md.texi, doc/rtl.texi,
doc/tm.texi: consistently use "VAX", "VAXen", and "MicroVAX"
in comments and documentation.
From-SVN: r44589
2001-08-03 03:19:20 +02:00
|
|
|
|
but breaks the VAX pcc. */
|
1999-09-21 22:19:18 +02:00
|
|
|
|
found = 1;
|
|
|
|
|
}
|
2001-10-02 17:44:55 +02:00
|
|
|
|
else if (p[0] == 'n' && p[1] == 'o' && p[2] == '-'
|
|
|
|
|
&& ! strcmp (p+3, lang_f_options[j].string))
|
1999-09-21 22:19:18 +02:00
|
|
|
|
{
|
|
|
|
|
*lang_f_options[j].variable = ! lang_f_options[j].on_value;
|
|
|
|
|
found = 1;
|
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
2001-10-02 17:44:55 +02:00
|
|
|
|
|
1999-09-21 22:19:18 +02:00
|
|
|
|
return found;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (p[0] == '-' && p[1] == 'W')
|
|
|
|
|
{
|
|
|
|
|
int setting = 1;
|
|
|
|
|
|
|
|
|
|
/* The -W options control the warning behavior of the compiler. */
|
|
|
|
|
p += 2;
|
|
|
|
|
|
|
|
|
|
if (p[0] == 'n' && p[1] == 'o' && p[2] == '-')
|
|
|
|
|
setting = 0, p += 3;
|
|
|
|
|
|
|
|
|
|
if (!strcmp (p, "implicit"))
|
|
|
|
|
warn_implicit = setting;
|
1998-07-08 14:16:05 +02:00
|
|
|
|
else if (!strcmp (p, "long-long"))
|
|
|
|
|
warn_long_long = setting;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (!strcmp (p, "return-type"))
|
|
|
|
|
warn_return_type = setting;
|
|
|
|
|
else if (!strcmp (p, "ctor-dtor-privacy"))
|
|
|
|
|
warn_ctor_dtor_privacy = setting;
|
|
|
|
|
else if (!strcmp (p, "write-strings"))
|
|
|
|
|
warn_write_strings = setting;
|
|
|
|
|
else if (!strcmp (p, "cast-qual"))
|
|
|
|
|
warn_cast_qual = setting;
|
|
|
|
|
else if (!strcmp (p, "char-subscripts"))
|
|
|
|
|
warn_char_subscripts = setting;
|
|
|
|
|
else if (!strcmp (p, "pointer-arith"))
|
|
|
|
|
warn_pointer_arith = setting;
|
|
|
|
|
else if (!strcmp (p, "missing-prototypes"))
|
|
|
|
|
warn_missing_prototypes = setting;
|
2000-08-03 10:26:36 +02:00
|
|
|
|
else if (!strcmp (p, "strict-prototypes"))
|
|
|
|
|
{
|
|
|
|
|
if (setting == 0)
|
|
|
|
|
warning ("-Wno-strict-prototypes is not supported in C++");
|
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (!strcmp (p, "redundant-decls"))
|
|
|
|
|
warn_redundant_decls = setting;
|
|
|
|
|
else if (!strcmp (p, "missing-braces"))
|
|
|
|
|
warn_missing_braces = setting;
|
1996-02-09 23:43:25 +01:00
|
|
|
|
else if (!strcmp (p, "sign-compare"))
|
|
|
|
|
warn_sign_compare = setting;
|
1999-09-30 08:15:53 +02:00
|
|
|
|
else if (!strcmp (p, "float-equal"))
|
|
|
|
|
warn_float_equal = setting;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (!strcmp (p, "format"))
|
c-common.c (warn_format, [...]): Define.
* c-common.c (warn_format, warn_format_y2k,
warn_format_extra_args, warn_format_nonliteral): Define.
(check_format_info): Check warn_format_nonliteral and
warn_format_extra_args.
(check_format_info_main): Check warn_format_y2k.
(set_Wformat): New function.
* c-common.h (warn_format_y2k, warn_format_extra_args,
warn_format_nonliteral, set_Wformat): Declare.
* c-decl.c (warn_format): Remove definition.
(c_decode_option): Handle -Wformat-nonliteral,
-Wno-format-extra-args and -Wno-format-y2k, and negated versions.
Use set_Wformat.
* invoke.texi: Document these new options and -Wformat=2.
* toplev.c (documented_lang_options): Add these new options.
cp:
* decl2.c (warn_format): Remove definition.
(lang_decode_option): Handle -Wformat-nonliteral,
-Wno-format-extra-args and -Wno-format-y2k. Use set_Wformat.
testsuite:
* gcc.dg/format-no-exargs-1.c, gcc.dg/format-no-y2k-1.c,
gcc.dg/format-nonlit-1.c, gcc.dg/format-nonlit-2.c: New tests.
From-SVN: r37933
2000-12-01 23:43:33 +01:00
|
|
|
|
set_Wformat (setting);
|
2001-01-09 11:37:02 +01:00
|
|
|
|
else if (!strcmp (p, "format=2"))
|
|
|
|
|
set_Wformat (2);
|
c-common.c (warn_format, [...]): Define.
* c-common.c (warn_format, warn_format_y2k,
warn_format_extra_args, warn_format_nonliteral): Define.
(check_format_info): Check warn_format_nonliteral and
warn_format_extra_args.
(check_format_info_main): Check warn_format_y2k.
(set_Wformat): New function.
* c-common.h (warn_format_y2k, warn_format_extra_args,
warn_format_nonliteral, set_Wformat): Declare.
* c-decl.c (warn_format): Remove definition.
(c_decode_option): Handle -Wformat-nonliteral,
-Wno-format-extra-args and -Wno-format-y2k, and negated versions.
Use set_Wformat.
* invoke.texi: Document these new options and -Wformat=2.
* toplev.c (documented_lang_options): Add these new options.
cp:
* decl2.c (warn_format): Remove definition.
(lang_decode_option): Handle -Wformat-nonliteral,
-Wno-format-extra-args and -Wno-format-y2k. Use set_Wformat.
testsuite:
* gcc.dg/format-no-exargs-1.c, gcc.dg/format-no-y2k-1.c,
gcc.dg/format-nonlit-1.c, gcc.dg/format-nonlit-2.c: New tests.
From-SVN: r37933
2000-12-01 23:43:33 +01:00
|
|
|
|
else if (!strcmp (p, "format-y2k"))
|
|
|
|
|
warn_format_y2k = setting;
|
|
|
|
|
else if (!strcmp (p, "format-extra-args"))
|
|
|
|
|
warn_format_extra_args = setting;
|
|
|
|
|
else if (!strcmp (p, "format-nonliteral"))
|
|
|
|
|
warn_format_nonliteral = setting;
|
2000-12-07 08:56:44 +01:00
|
|
|
|
else if (!strcmp (p, "format-security"))
|
|
|
|
|
warn_format_security = setting;
|
2000-10-17 08:52:06 +02:00
|
|
|
|
else if (!strcmp (p, "missing-format-attribute"))
|
|
|
|
|
warn_missing_format_attribute = setting;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (!strcmp (p, "conversion"))
|
|
|
|
|
warn_conversion = setting;
|
|
|
|
|
else if (!strcmp (p, "parentheses"))
|
|
|
|
|
warn_parentheses = setting;
|
1994-06-30 03:51:05 +02:00
|
|
|
|
else if (!strcmp (p, "non-virtual-dtor"))
|
|
|
|
|
warn_nonvdtor = setting;
|
1994-09-26 21:15:18 +01:00
|
|
|
|
else if (!strcmp (p, "reorder"))
|
|
|
|
|
warn_reorder = setting;
|
|
|
|
|
else if (!strcmp (p, "synth"))
|
|
|
|
|
warn_synth = setting;
|
1996-11-12 20:49:48 +01:00
|
|
|
|
else if (!strcmp (p, "pmf-conversions"))
|
|
|
|
|
warn_pmf2ptr = setting;
|
1997-05-02 03:42:58 +02:00
|
|
|
|
else if (!strcmp (p, "effc++"))
|
|
|
|
|
warn_ecpp = setting;
|
1997-08-20 00:37:19 +02:00
|
|
|
|
else if (!strcmp (p, "sign-promo"))
|
|
|
|
|
warn_sign_promo = setting;
|
1997-09-29 21:05:04 +02:00
|
|
|
|
else if (!strcmp (p, "old-style-cast"))
|
|
|
|
|
warn_old_style_cast = setting;
|
1998-07-07 13:25:01 +02:00
|
|
|
|
else if (!strcmp (p, "overloaded-virtual"))
|
|
|
|
|
warn_overloaded_virtual = setting;
|
|
|
|
|
else if (!strcmp (p, "multichar"))
|
|
|
|
|
warn_multichar = setting;
|
1997-12-21 16:22:02 +01:00
|
|
|
|
else if (!strcmp (p, "unknown-pragmas"))
|
|
|
|
|
/* Set to greater than 1, so that even unknown pragmas in
|
|
|
|
|
system headers will be warned about. */
|
|
|
|
|
warn_unknown_pragmas = setting * 2;
|
1998-09-03 18:10:00 +02:00
|
|
|
|
else if (!strcmp (p, "non-template-friend"))
|
|
|
|
|
warn_nontemplate_friend = setting;
|
1999-04-14 07:34:55 +02:00
|
|
|
|
else if (!strcmp (p, "deprecated"))
|
|
|
|
|
warn_deprecated = setting;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (!strcmp (p, "all"))
|
|
|
|
|
{
|
|
|
|
|
warn_return_type = setting;
|
2000-05-17 10:15:29 +02:00
|
|
|
|
set_Wunused (setting);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
warn_implicit = setting;
|
|
|
|
|
warn_switch = setting;
|
c-common.c (warn_format, [...]): Define.
* c-common.c (warn_format, warn_format_y2k,
warn_format_extra_args, warn_format_nonliteral): Define.
(check_format_info): Check warn_format_nonliteral and
warn_format_extra_args.
(check_format_info_main): Check warn_format_y2k.
(set_Wformat): New function.
* c-common.h (warn_format_y2k, warn_format_extra_args,
warn_format_nonliteral, set_Wformat): Declare.
* c-decl.c (warn_format): Remove definition.
(c_decode_option): Handle -Wformat-nonliteral,
-Wno-format-extra-args and -Wno-format-y2k, and negated versions.
Use set_Wformat.
* invoke.texi: Document these new options and -Wformat=2.
* toplev.c (documented_lang_options): Add these new options.
cp:
* decl2.c (warn_format): Remove definition.
(lang_decode_option): Handle -Wformat-nonliteral,
-Wno-format-extra-args and -Wno-format-y2k. Use set_Wformat.
testsuite:
* gcc.dg/format-no-exargs-1.c, gcc.dg/format-no-y2k-1.c,
gcc.dg/format-nonlit-1.c, gcc.dg/format-nonlit-2.c: New tests.
From-SVN: r37933
2000-12-01 23:43:33 +01:00
|
|
|
|
set_Wformat (setting);
|
1995-01-24 09:19:58 +01:00
|
|
|
|
warn_parentheses = setting;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
warn_missing_braces = setting;
|
1996-02-09 23:43:25 +01:00
|
|
|
|
warn_sign_compare = setting;
|
1998-07-07 13:25:01 +02:00
|
|
|
|
warn_multichar = setting;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* We save the value of warn_uninitialized, since if they put
|
|
|
|
|
-Wuninitialized on the command line, we need to generate a
|
|
|
|
|
warning about not using it without also specifying -O. */
|
|
|
|
|
if (warn_uninitialized != 1)
|
|
|
|
|
warn_uninitialized = (setting ? 2 : 0);
|
1997-12-21 16:22:02 +01:00
|
|
|
|
/* Only warn about unknown pragmas that are not in system
|
|
|
|
|
headers. */
|
1998-09-03 18:10:00 +02:00
|
|
|
|
warn_unknown_pragmas = 1;
|
1999-03-29 18:13:51 +02:00
|
|
|
|
|
|
|
|
|
/* C++-specific warnings. */
|
|
|
|
|
warn_ctor_dtor_privacy = setting;
|
|
|
|
|
warn_nonvdtor = setting;
|
|
|
|
|
warn_reorder = setting;
|
1998-09-03 18:10:00 +02:00
|
|
|
|
warn_nontemplate_friend = setting;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
1998-06-10 12:16:45 +02:00
|
|
|
|
else return strings_processed;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
Removal of separate preprocessor cpp0.
* Makefile.in (GCC_PASSES, STAGESTUFF, LIBCPP_OBJS,
cpp0, install-common): Update.
* c-common.c (flag_preprocess_only): New.
(c_common_init): Preprocess for -E.
* c-common.h (flag_preprocess_only): New.
* c-decl.c (c_decode_option): Handle -E, and -std=c++98.
* c-objc-common.c (c_init_decl_processing): Exit quickly
for NULL return from c_common_init.
* cpplib.h (cpp_preprocess_file): New.
* cppmain.c (main, general_init, pfile, progname): Remove.
(do_preprocessing): Rename cpp_preprocess_file, don't call
cpp_finish. Don't close stdout here.
(setup_callbacks): Update prototype.
* gcc.c (trad_capable_cpp, cpp_unique_options, default_compilers):
Update.
* tradcpp.c (main): Ignore -quiet.
cp:
* decl2.c (cxx_decode_option): Handle -E.
* lang-specs.h (default_compilers): Preprocess with cc1plus.
* lex.c (cxx_init): Exit quickly if c_common_init returns NULL.
objc:
* lang-specs.h (default_compilers): Preprocess with cc1obj.
Co-Authored-By: Aldy Hernandez <aldyh@redhat.com>
From-SVN: r51256
2002-03-24 13:27:45 +01:00
|
|
|
|
else if (!strcmp (p, "-E"))
|
|
|
|
|
flag_preprocess_only = 1;
|
2002-05-10 00:48:36 +02:00
|
|
|
|
else if (!strcmp (p, "-undef"))
|
|
|
|
|
flag_undef = 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (!strcmp (p, "-ansi"))
|
2002-05-10 00:48:36 +02:00
|
|
|
|
flag_no_nonansi_builtin = 1, flag_iso = 1,
|
2000-08-21 16:30:38 +02:00
|
|
|
|
flag_noniso_default_format_attributes = 0, flag_no_gnu_keywords = 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
#ifdef SPEW_DEBUG
|
|
|
|
|
/* Undocumented, only ever used when you're invoking cc1plus by hand, since
|
|
|
|
|
it's probably safe to assume no sane person would ever want to use this
|
|
|
|
|
under normal circumstances. */
|
|
|
|
|
else if (!strcmp (p, "-spew-debug"))
|
|
|
|
|
spew_debug = 1;
|
|
|
|
|
#endif
|
|
|
|
|
else
|
1998-06-10 12:16:45 +02:00
|
|
|
|
return strings_processed;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Incorporate `const' and `volatile' qualifiers for member functions.
|
|
|
|
|
FUNCTION is a TYPE_DECL or a FUNCTION_DECL.
|
1999-11-19 14:03:00 +01:00
|
|
|
|
QUALS is a list of qualifiers. Returns any explicit
|
|
|
|
|
top-level qualifiers of the method's this pointer, anything other than
|
|
|
|
|
TYPE_UNQUALIFIED will be an extension. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1999-11-19 14:03:00 +01:00
|
|
|
|
int
|
1994-02-24 02:02:37 +01:00
|
|
|
|
grok_method_quals (ctype, function, quals)
|
|
|
|
|
tree ctype, function, quals;
|
|
|
|
|
{
|
|
|
|
|
tree fntype = TREE_TYPE (function);
|
|
|
|
|
tree raises = TYPE_RAISES_EXCEPTIONS (fntype);
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
int type_quals = TYPE_UNQUALIFIED;
|
|
|
|
|
int dup_quals = TYPE_UNQUALIFIED;
|
1999-11-19 14:03:00 +01:00
|
|
|
|
int this_quals = TYPE_UNQUALIFIED;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
int tq = cp_type_qual_from_rid (TREE_VALUE (quals));
|
|
|
|
|
|
1999-11-19 14:03:00 +01:00
|
|
|
|
if ((type_quals | this_quals) & tq)
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
dup_quals |= tq;
|
1999-11-19 14:03:00 +01:00
|
|
|
|
else if (tq & TYPE_QUAL_RESTRICT)
|
|
|
|
|
this_quals |= tq;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
type_quals |= tq;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
quals = TREE_CHAIN (quals);
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
while (quals);
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
|
|
|
|
|
if (dup_quals != TYPE_UNQUALIFIED)
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("duplicate type qualifiers in %s declaration",
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
TREE_CODE (function) == FUNCTION_DECL
|
|
|
|
|
? "member function" : "type");
|
|
|
|
|
|
|
|
|
|
ctype = cp_build_qualified_type (ctype, type_quals);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
fntype = build_cplus_method_type (ctype, TREE_TYPE (fntype),
|
|
|
|
|
(TREE_CODE (fntype) == METHOD_TYPE
|
|
|
|
|
? TREE_CHAIN (TYPE_ARG_TYPES (fntype))
|
|
|
|
|
: TYPE_ARG_TYPES (fntype)));
|
|
|
|
|
if (raises)
|
1995-10-12 03:33:51 +01:00
|
|
|
|
fntype = build_exception_variant (fntype, raises);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
TREE_TYPE (function) = fntype;
|
1999-11-19 14:03:00 +01:00
|
|
|
|
return this_quals;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Warn when -fexternal-templates is used and #pragma
|
|
|
|
|
interface/implementation is not used all the times it should be,
|
|
|
|
|
inform the user. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
void
|
1995-02-16 16:24:37 +01:00
|
|
|
|
warn_if_unknown_interface (decl)
|
|
|
|
|
tree decl;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
static int already_warned = 0;
|
1995-02-16 16:24:37 +01:00
|
|
|
|
if (already_warned++)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (flag_alt_external_templates)
|
|
|
|
|
{
|
2000-06-06 02:12:40 +02:00
|
|
|
|
tree til = tinst_for_decl ();
|
1995-02-16 16:24:37 +01:00
|
|
|
|
int sl = lineno;
|
top level:
* Makefile.in (WARN_CFLAGS): Add -Wwrite-strings.
(tree.o): Depend on output.h.
* c-decl.c (pending_invalid_xref_file,
current_function_prototype_file): Constify.
(pushdecl): Constify a local char *.
(define_label): Constify filename parameter.
* c-lex.c (init_parse): Constify parameter and return value.
* c-typeck.c (c_expand_asm_operands): Constify filename parameter.
* c-tree.h: Update prototypes.
* c-parse.in: Constify filename member of %union, and if_stmt_file.
* c-parse.y, c-parse.c, c-parse.h, objc/objc-parse.y,
objc/objc-parse.c: Regenerate.
* dwarfout.c (dwarfout_init): Constify main_input_filename parameter.
* dwarfout.h: Update prototypes.
* expr.c (expand_expr): Constify a local char *.
* flags.h: Constify main_input_filename.
* function.c (expand_function_end): Constify filename parameter.
* genrecog.c (make_insn_sequence): Use a character array for
c_test_pos.
(main): Remove unused variables.
* input.h: Constify input_filename, main_input_filename, and
file_stack.name. Update prototypes.
* output.h: Declare first_global_object_name and
weak_global_object_name here, as const char *.
* stmt.c (expand_asm_operands): Constify filename parameter.
* toplev.c (compile_file, push_srcloc, debug_start_source_file):
Constify filename parameter.
(input_filename, main_input_filename): Constify.
* toplev.h: Update prototypes.
* tree.c: Include output.h. Don't declare
first_global_object_name or weak_global_object_name. Clean up string
bashing in get_file_function_name_long.
* tree.h (struct tree_decl): Constify filename member.
(input_filename): Constify.
Update prototypes.
* varasm.c (first_global_object_name, weak_global_object_name):
Constify.
(assemble_start_function, assemble_variable): Clean up string bashing.
* gcc.c: Constify all spec-related strings initialized,
transitively, from string constants. Constify all strings
and string variables related to multilibs.
(set_spec, read_specs): Cast argument to free to PTR.
(used_arg): Do not modify multilib_matches. Use strncmp plus
length comparison to compare multilib switches.
* genmultilib: Constify everything declared in multilib.h.
ch:
* ch-tree.h: Update prototypes. Remove prototypes for
functions declared elsewhere.
* decl.c (define_label): Constify filename parameter.
* grant.c (globalize_decl, set_default_grant_file): Constify
local char * variables. Don't declare
first_global_object_name or asm_out_file.
* lang.c (chill_real_input_filename): Constify.
* lex.c (init_parse): Constify parameter and return value.
* parse.c: Don't declare input_filename.
(ch_expand_asm_operands): Constify filename parameter.
(parse_multi_dimension_case_action): Constify local char *.
* satisfy.c (safe_satisfy_decl): Constify local char *.
cp:
* cp-tree.h: Constify tree_srcloc.filename, tinst_level.file,
and pending_inline.filename. Update prototypes.
* decl.c (define_label): Constify filename parameter.
* decl2.c (warn_if_unknown_interface): Constify local char *.
* input.c Constify input_source.filename. Don't declare
input_filename or lineno. Constify filename parameter to feed_input.
* lex.c (init_parse): Constify parameter and return value.
(cp_pragma_interface, cp_pragma_implementation): Constify
filename argument.
(reinit_parse_for_method, reinit_parse_for_block,
reinit_parse_for_expr, feed_defarg, handle_cp_pragma):
Constify local char *.
* pt.c: Don't declare lineno or input_filename.
(print_template_context, tsubst_friend_function, tsubst_decl,
tsubst, instantiate_decl): Constify local char *.
* semantics.c (expand_body): Constify local char *.
* tree.c (build_srcloc): Constify filename parameter.
* typeck.c (c_expand_asm_operands): Constify filename
parameter.
f:
* com.c (ffecom_subscript_check_): Constify array_name
parameter. Clean up string bashing.
(ffecom_arrayref_, ffecom_char_args_x_): Constify array_name
parameter.
(ffecom_do_entry_, ffecom_gen_sfuncdef_, ffecom_start_progunit_,
ffecom_sym_transform_, ffecom_sym_transform_assign_): Constify
local char *.
(init_parse): Constify parameter and return value.
* lex.c: Include dwarfout.h instead of prototyping dwarfout_*
functions here.
(ffelex_file_pop_, ffelex_file_push_): Constify filename parameter.
(ffelex_hash_, ffelex_include_): Constify local char *.
* std.c (ffestd_exec_end): Constify local char *.
* where.c (ffewhere_file_new): Constify filename parameter.
* where.h: Update prototypes.
java:
* check_init.c (check_init): Constify local char *.
* class.c (push_class): Constify local char *.
* java_tree.h: Update prototypes.
* jcf-io.c (open_class): Constify filename parameter and
return value.
(find_class): Remove redundant string copy. Cast return from
open_class.
* jcf-parse.c (read_class, parse_class_file, yyparse):
Constify local char *.
* jcf-write.c (generate_bytecode_insns, generate_classfile):
Constify local char *.
* jcf.h (JCF): Constify filename and classname.
(JCF_FINISH): Cast args to FREE to char * when appropriate.
* lang.c (init_parse): Constify parameter and return value.
* lex.c (java_get_line_col): Constify filename parameter.
* parse.h: Constify parser_ctxt.filename. Update prototypes.
* parse.y (java_parser_context_suspend,
issue_warning_error_from_context, safe_layout_class): Constify
local char *.
* parse.c: Regenerate.
From-SVN: r33804
2000-05-09 21:56:01 +02:00
|
|
|
|
const char *sf = input_filename;
|
1995-02-16 16:24:37 +01:00
|
|
|
|
|
1995-10-12 03:33:51 +01:00
|
|
|
|
if (til)
|
|
|
|
|
{
|
2000-06-06 02:12:40 +02:00
|
|
|
|
lineno = TINST_LINE (til);
|
|
|
|
|
input_filename = TINST_FILE (til);
|
1995-10-12 03:33:51 +01:00
|
|
|
|
}
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
warning ("template `%#D' instantiated in file without #pragma interface",
|
1995-02-16 16:24:37 +01:00
|
|
|
|
decl);
|
|
|
|
|
lineno = sl;
|
|
|
|
|
input_filename = sf;
|
|
|
|
|
}
|
|
|
|
|
else
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_warning_at ("template `%#D' defined in file without #pragma interface",
|
1995-02-16 16:24:37 +01:00
|
|
|
|
decl);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of the parser, to handle a component list. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1998-10-06 16:20:30 +02:00
|
|
|
|
void
|
|
|
|
|
grok_x_components (specs)
|
|
|
|
|
tree specs;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1998-10-06 16:20:30 +02:00
|
|
|
|
tree t;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1998-11-23 02:14:55 +01:00
|
|
|
|
specs = strip_attrs (specs);
|
|
|
|
|
|
|
|
|
|
check_tag_decl (specs);
|
2000-10-13 08:26:46 +02:00
|
|
|
|
t = groktypename (build_tree_list (specs, NULL_TREE));
|
cp-tree.h (TI_USES_TEMPLATE_PARMS): Remove.
* cp-tree.h (TI_USES_TEMPLATE_PARMS): Remove.
(build_template_decl_overload): Remove.
(set_mangled_name_for_decl): New function.
(innermost_args): Remove is_spec parameter.
(most_specialized, most_specialized_class): Remove declarations.
(lookup_template_class): Add entering_scope parameter.
(maybe_process_partial_specialization): New function.
(finish_template_decl): Likewise.
(finish_template_type): Likewise.
* class.c (finish_struct): Clean up processing of member template
specializations.
* decl.c (pushtag): Fix formatting.
(lookup_tag): Improve handling of pseudo-global levels.
(make_typename_type): Adjust call to lookup_template_class.
(shadow_tag): Use maybe_process_partial_specialization.
(xref_tag): Improve handling of member friends.
(start_function): Call push_nested_class before
push_template_decl. Don't call push_template_decl for
specializations.
* decl2.c (grok_x_components): Don't call xref_tag for
template instantiations. Handle UNION_TYPEs like RECORD_TYPEs.
(grokclassfn): Use set_mangled_name_for_decl.
(arg_assoc_class): Adjust call to innermost_args.
(mark_used): Don't call instantiate_decl for a TEMPLATE_DECL.
* error.c (dump_function_name): Improve printing of template
function names.
* friend.c (is_friend): Don't compare types of decls to determine
friendship, unless flag_guiding_decls.
(make_friend_class): Partial specializations cannot be friends.
(do_friend): Use set_mangled_name_for_decl. Call
push_template_decl_real instead of push_template_decl.
* method.c (build_decl_overload_real): Remove prototype. Give it
external linkage.
(build_overload_identififer): Adjust call to innermost_args.
(build_template_decl_overload): Remove.
(set_mangled_name_for_decl): New function.
* parse.y (.finish_template_type): New non-terminal.
(template_def): Use finish_template_decl. Use template_extdef
instead of extdef.
(template_extdef, template_datadef): New non-terminals, containing
only those rules for things which can be templates.
(datadef): Tidy.
(template_type, self_template_type): Use .finish_template_type.
(named_class_head): Use maybe_process_partial_specialization.
* pt.c (mangle_class_name_for_template): Remove context parameter.
(get_class_bindings): Remove outer_args parameter.
(complete_template_args): Remove.
(add_outermost_template_args): New function.
(register_specialization): Return the specialization.
(unregister_specialization): New function.
(tsubst_template_parms): Likewise.
(most_specialized, most_specialized_class): Prototype here as
static.
(original_template): Rename to most_general_template.
(tsubst_template_parms): New function.
(set_mangled_name_for_template_decl): Likewise.
(TMPL_ARGS_DEPTH): New macro.
(TMPL_ARGS_HAVE_MULTIPLE_LEVELS): Adjust.
(TMPL_ARGS_LEVEL): New macro.
(SET_TMPL_ARGS_LEVEL): Likewise.
(TMPL_ARG): Likewise.
(SET_TMPL_ARG): Likewise.
(TMPL_ARGS_DEPTH): Likewise.
(finish_member_template_decl): Use finish_template_decl.
(maybe_process_partial_specialization): New function, split out
from tsubst.
(inline_needs_template_parms): Use TMPL_PARMS_DEPTH.
(maybe_begin_member_template_processing): Use new macros.
(is_member_template): Likewise.
(is_member_template_class): Likewise.
(add_to_template_args): Likewise. Deal with multiple levels of
args.
(maybe_process_partial_specialization): New function.
(retrieve_specialization): Add consistency check.
(determine_specialization): Return full argument list.
(check_explicit_specialization): Tweak friend handling. Use full
argument lists. Simplify.
(current_template_args): Use new macros.
(push_template_decl_real): Change ill-named mainargs to specargs.
Check that a partial specialization actually specializes at least
one parameter. Improve friend handling. Modify for full
template arguments.
(classtype_mangled_name): Don't mangle the names of
specializations.
(lookup_template_class): Add entering_scope parameter. Use it to
avoid finding a template type when an instantiation is required.
Simplify. Use full template arguments.
(tsubst_friend_function): Use unregister_specialization. Use new
macros. Use full template arguments.
(tsubst_friend_class): Substitute, using tsubst_template_parms,
into the template parameters before passing them to
redeclare_class_template.
(instantiate_class_template): Simplify. Use full template
arguments. Adjust calls to get_class_bindings. Use
SET_IDENTIFIER_TYPE_VALUE where needed. Improve friend handling.
(innermost_args): Use new macros.
(tsubst_aggr_type): New function, split out from tsubst.
(tsubst): Use tsubst_aggr_type, tsubst_template_parms, new calling
conventions for lookup_tmeplate_class. Refine handling of partial
instantiations. Remove calls to complete_template_args.
Simplify. Add consistency checks. Use set_mangled_name_for_decl
and set_mangled_name_for_template_decl.
(tsubst_copy): Use tsubst_aggr_type.
(instantiate_template): Use full template arguments.
(more_specialized): Improve formatting.
(more_specialized_class): Adjust calls to get_class_bindings.
(get_bindings_real): Don't call complete_template_args.
(most_specialized): Don't overwrite input; create a new list.
(most_specialized_class): Use most_general_template.
(regenerate_decl_from_template): Use unregister_specialization.
Use full template arguments.
(instantiate_decl): Use full template arguments.
(set_mangled_name_for_template_decl): New function.
* semantics.c (begin_class_definition): Use
maybe_process_partial_specialization.
(finish_member_class_template): New function.
(finish_template_decl): Likewise.
(finish_template_type): Likewise.
(typeck.c): Don't crash after issuing a compiler_error.
* Makefile.in (CONFLICTS): Adjust; we removed a s/r conflict.
From-SVN: r21433
1998-07-28 03:03:16 +02:00
|
|
|
|
|
1998-10-06 16:20:30 +02:00
|
|
|
|
/* The only case where we need to do anything additional here is an
|
|
|
|
|
anonymous union field, e.g.: `struct S { union { int i; }; };'. */
|
1999-05-19 12:44:22 +02:00
|
|
|
|
if (t == NULL_TREE || !ANON_AGGR_TYPE_P (t))
|
1998-10-06 16:20:30 +02:00
|
|
|
|
return;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1999-05-19 12:44:22 +02:00
|
|
|
|
fixup_anonymous_aggr (t);
|
2000-05-24 08:15:04 +02:00
|
|
|
|
finish_member_declaration (build_decl (FIELD_DECL, NULL_TREE, t));
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
2000-05-26 01:27:18 +02:00
|
|
|
|
/* Returns a PARM_DECL for a parameter of the indicated TYPE, with the
|
|
|
|
|
indicated NAME. */
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
build_artificial_parm (name, type)
|
|
|
|
|
tree name;
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
tree parm;
|
|
|
|
|
|
|
|
|
|
parm = build_decl (PARM_DECL, name, type);
|
2000-06-29 16:03:10 +02:00
|
|
|
|
DECL_ARTIFICIAL (parm) = 1;
|
2001-02-18 01:00:29 +01:00
|
|
|
|
/* All our artificial parms are implicitly `const'; they cannot be
|
|
|
|
|
assigned to. */
|
|
|
|
|
TREE_READONLY (parm) = 1;
|
2000-05-26 01:27:18 +02:00
|
|
|
|
DECL_ARG_TYPE (parm) = type;
|
|
|
|
|
return parm;
|
|
|
|
|
}
|
|
|
|
|
|
1998-05-29 04:33:54 +02:00
|
|
|
|
/* Constructors for types with virtual baseclasses need an "in-charge" flag
|
|
|
|
|
saying whether this constructor is responsible for initialization of
|
|
|
|
|
virtual baseclasses or not. All destructors also need this "in-charge"
|
|
|
|
|
flag, which additionally determines whether or not the destructor should
|
|
|
|
|
free the memory for the object.
|
|
|
|
|
|
|
|
|
|
This function adds the "in-charge" flag to member function FN if
|
|
|
|
|
appropriate. It is called from grokclassfn and tsubst.
|
2001-02-18 20:08:00 +01:00
|
|
|
|
FN must be either a constructor or destructor.
|
|
|
|
|
|
|
|
|
|
The in-charge flag follows the 'this' parameter, and is followed by the
|
|
|
|
|
VTT parm (if any), then the user-written parms. */
|
1998-05-29 04:33:54 +02:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
maybe_retrofit_in_chrg (fn)
|
|
|
|
|
tree fn;
|
|
|
|
|
{
|
|
|
|
|
tree basetype, arg_types, parms, parm, fntype;
|
|
|
|
|
|
2000-04-11 18:56:14 +02:00
|
|
|
|
/* If we've already add the in-charge parameter don't do it again. */
|
|
|
|
|
if (DECL_HAS_IN_CHARGE_PARM_P (fn))
|
1998-05-29 04:33:54 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2000-05-24 06:34:38 +02:00
|
|
|
|
/* When processing templates we can't know, in general, whether or
|
|
|
|
|
not we're going to have virtual baseclasses. */
|
|
|
|
|
if (uses_template_parms (fn))
|
|
|
|
|
return;
|
|
|
|
|
|
2000-04-11 18:56:14 +02:00
|
|
|
|
/* We don't need an in-charge parameter for constructors that don't
|
|
|
|
|
have virtual bases. */
|
|
|
|
|
if (DECL_CONSTRUCTOR_P (fn)
|
|
|
|
|
&& !TYPE_USES_VIRTUAL_BASECLASSES (DECL_CONTEXT (fn)))
|
|
|
|
|
return;
|
1998-05-29 04:33:54 +02:00
|
|
|
|
|
|
|
|
|
arg_types = TYPE_ARG_TYPES (TREE_TYPE (fn));
|
|
|
|
|
basetype = TREE_TYPE (TREE_VALUE (arg_types));
|
2001-02-18 20:08:00 +01:00
|
|
|
|
arg_types = TREE_CHAIN (arg_types);
|
|
|
|
|
|
|
|
|
|
parms = TREE_CHAIN (DECL_ARGUMENTS (fn));
|
|
|
|
|
|
|
|
|
|
/* If this is a subobject constructor or destructor, our caller will
|
|
|
|
|
pass us a pointer to our VTT. */
|
|
|
|
|
if (TYPE_USES_VIRTUAL_BASECLASSES (DECL_CONTEXT (fn)))
|
|
|
|
|
{
|
|
|
|
|
parm = build_artificial_parm (vtt_parm_identifier, vtt_parm_type);
|
|
|
|
|
|
|
|
|
|
/* First add it to DECL_ARGUMENTS between 'this' and the real args... */
|
|
|
|
|
TREE_CHAIN (parm) = parms;
|
|
|
|
|
parms = parm;
|
|
|
|
|
|
|
|
|
|
/* ...and then to TYPE_ARG_TYPES. */
|
|
|
|
|
arg_types = hash_tree_chain (vtt_parm_type, arg_types);
|
|
|
|
|
|
|
|
|
|
DECL_HAS_VTT_PARM_P (fn) = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Then add the in-charge parm (before the VTT parm). */
|
|
|
|
|
parm = build_artificial_parm (in_charge_identifier, integer_type_node);
|
|
|
|
|
TREE_CHAIN (parm) = parms;
|
|
|
|
|
parms = parm;
|
|
|
|
|
arg_types = hash_tree_chain (integer_type_node, arg_types);
|
|
|
|
|
|
|
|
|
|
/* Insert our new parameter(s) into the list. */
|
|
|
|
|
TREE_CHAIN (DECL_ARGUMENTS (fn)) = parms;
|
|
|
|
|
|
|
|
|
|
/* And rebuild the function type. */
|
1998-05-29 04:33:54 +02:00
|
|
|
|
fntype = build_cplus_method_type (basetype, TREE_TYPE (TREE_TYPE (fn)),
|
|
|
|
|
arg_types);
|
|
|
|
|
if (TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn)))
|
|
|
|
|
fntype = build_exception_variant (fntype,
|
|
|
|
|
TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn)));
|
|
|
|
|
TREE_TYPE (fn) = fntype;
|
2000-04-11 18:56:14 +02:00
|
|
|
|
|
|
|
|
|
/* Now we've got the in-charge parameter. */
|
|
|
|
|
DECL_HAS_IN_CHARGE_PARM_P (fn) = 1;
|
1998-05-29 04:33:54 +02:00
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Classes overload their constituent function names automatically.
|
|
|
|
|
When a function name is declared in a record structure,
|
|
|
|
|
its name is changed to it overloaded name. Since names for
|
|
|
|
|
constructors and destructors can conflict, we place a leading
|
|
|
|
|
'$' for destructors.
|
|
|
|
|
|
|
|
|
|
CNAME is the name of the class we are grokking for.
|
|
|
|
|
|
|
|
|
|
FUNCTION is a FUNCTION_DECL. It was created by `grokdeclarator'.
|
|
|
|
|
|
|
|
|
|
FLAGS contains bits saying what's special about today's
|
|
|
|
|
arguments. 1 == DESTRUCTOR. 2 == OPERATOR.
|
|
|
|
|
|
|
|
|
|
If FUNCTION is a destructor, then we must add the `auto-delete' field
|
|
|
|
|
as a second parameter. There is some hair associated with the fact
|
|
|
|
|
that we must "declare" this variable in the manner consistent with the
|
|
|
|
|
way the rest of the arguments were declared.
|
|
|
|
|
|
|
|
|
|
QUALS are the qualifiers for the this pointer. */
|
|
|
|
|
|
|
|
|
|
void
|
1998-09-25 11:00:04 +02:00
|
|
|
|
grokclassfn (ctype, function, flags, quals)
|
|
|
|
|
tree ctype, function;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
enum overload_flags flags;
|
|
|
|
|
tree quals;
|
|
|
|
|
{
|
|
|
|
|
tree fn_name = DECL_NAME (function);
|
1999-11-19 14:03:00 +01:00
|
|
|
|
int this_quals = TYPE_UNQUALIFIED;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
2000-05-26 18:54:18 +02:00
|
|
|
|
/* Even within an `extern "C"' block, members get C++ linkage. See
|
|
|
|
|
[dcl.link] for details. */
|
2001-04-20 00:49:48 +02:00
|
|
|
|
SET_DECL_LANGUAGE (function, lang_cplusplus);
|
2000-05-26 18:54:18 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (fn_name == NULL_TREE)
|
|
|
|
|
{
|
1998-09-07 16:25:35 +02:00
|
|
|
|
error ("name missing for member function");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
fn_name = get_identifier ("<anonymous>");
|
|
|
|
|
DECL_NAME (function) = fn_name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (quals)
|
1999-11-19 14:03:00 +01:00
|
|
|
|
this_quals = grok_method_quals (ctype, function, quals);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (function)) == METHOD_TYPE)
|
|
|
|
|
{
|
|
|
|
|
/* Must add the class instance variable up front. */
|
|
|
|
|
/* Right now we just make this a pointer. But later
|
|
|
|
|
we may wish to make it special. */
|
1999-11-19 14:03:00 +01:00
|
|
|
|
tree type = TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (function)));
|
2000-04-06 02:51:25 +02:00
|
|
|
|
tree qual_type;
|
|
|
|
|
tree parm;
|
|
|
|
|
|
|
|
|
|
/* The `this' parameter is implicitly `const'; it cannot be
|
|
|
|
|
assigned to. */
|
|
|
|
|
this_quals |= TYPE_QUAL_CONST;
|
|
|
|
|
qual_type = cp_build_qualified_type (type, this_quals);
|
2000-05-26 01:27:18 +02:00
|
|
|
|
parm = build_artificial_parm (this_identifier, qual_type);
|
2000-04-06 02:51:25 +02:00
|
|
|
|
c_apply_type_quals_to_decl (this_quals, parm);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
TREE_CHAIN (parm) = last_function_parms;
|
|
|
|
|
last_function_parms = parm;
|
|
|
|
|
}
|
|
|
|
|
|
1998-05-29 04:33:54 +02:00
|
|
|
|
DECL_ARGUMENTS (function) = last_function_parms;
|
|
|
|
|
DECL_CONTEXT (function) = ctype;
|
|
|
|
|
|
Compute DECL_ASSEMBLER_NAME lazily.
* tree.h (DECL_ASSEMBLER_NAME): Compute it lazily.
(DECL_ASSEMBLER_NAME_SET_P): New macro.
(SET_DECL_ASSEMBLER_NAME): Likewise.
(COPY_DECL_ASSEMBLER_NAME): Likewise.
(set_decl_assembler_name): Declare.
(lang_set_decl_assembler_name): Likewise.
* tree.c (lang_set_decl_assembler_name): New variab.e
(set_decl_assembler_name): New function.
(init_obstacks): Set lang_set_decl_assembler_name.
(build_decl): Don't set DECL_ASSEMBLER_NAME.
* c-decl.c (duplicate_decls): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(builtin_function): Likewise.
(finish_decl): Likewise.
* dbxout.c (dbxout_type_methods): Likewise.
* ggc-common.c (ggc_mark_trees): Likewise.
* profile.c (output_func_start_profiler): Likewise.
* varasm.c (make_decl_rtl): Likewise.
* class.c (get_vtable_decl): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(add_method): Remove optimization involving comparison of
DECL_ASSEMBLER_NAME.
(build_vtbl_or_vbase_field): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(check_methods): Likewise.
(build_clone): Likewise.
(built_vtt): Likewise.
* cp-tree.h (DECL_NEEDED_P): Likewise.
* decl.c (pushtag): Likewise.
(duplicate_decls): Likewise.
(pushdecl): Likewise.
(builtin_function): Likewise.
(build_library_fn_1): Set DECL_LANGUAGE for library functions.
(build_cp_library_fn): Likewise.
(maybe_commonize_var): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(make_rtl_for_nonlocal_decl): Likewise.
(cp_finish_decl): Likewise.
(grokfndecl): Likewise.
(grokvardecl): Likewise.
(grokdeclarator): Likewise.
(start_function): Likewise.
(cp_missing_return_ok_p): Likewise.
* decl2.c (grokclassfn): Likewise.
(check_classfn): Likewise.
(finish_static_data_member_decl): Likewise.
(grokfield): Likewise.
* error.c (GLOBAL_IORD_P): Remove.
(dump_global_iord): Improve output.
(dump_decl): Avoid using DECL_ASSEMBLER_NAME.
* except.c (nothrow_libfn_p): Summarily reject any function not in
namespace-scope.
* init.c (build_java_class_ref): Don't explicitly set
DECL_ASSEMBLER_NAME after calling mangle_decl.
* mangle.c (mangle_decl_string): Handle extern "C" functions.
(mangle_decl): Set the DECL_ASSEMBLER_NAME for the decl.
* method.c (set_mangled_name_for_decl): Don't explicitly set
DECL_ASSEMBLER_NAME after calling mangle_decl.
(make_thunk): Explicitly set the DECL_ASSEMBLER_NAME and
IDENTIFIER_GLOBAL_VALUE for the thunk.
* pt.c (set_mangled_name_for_template_decl): Remove.
(check_explicit_specialization): Don't use it.
(looup_template_class): Don't set DECL_ASSEMBLER_NAME.
(tsubst_friend_function): Likewise.
(tsubst_decl): Likewise.
(regenerate_decl_from_template): Use COPY_DECL_ASSEMBLER_NAME.
* rtti.c (get_tinfo_decl): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(tinfo_base_init): Likewise.
(create_real_tinfo_var): Likewise.
* search.c (looup_field_1): Likewise.
* semantics.c (finish_named_return_value): Likewise.
* tree.c (init_tree): Set lang_set_decl_assembler_name.
* com.c (builtin_function): Use SET_DECL_ASSEMBLER_NAME.
* class.c (build_class_ref): Use SET_DECL_ASSEMBLER_NAME.
(layout_class): Likewise.
(layout_class_method): Likewise.
(emit_register_classes): Likewise.
* decl.c (builtin_function): Likewise.
(give_name_to_locals): Likewise.
From-SVN: r40642
2001-03-20 00:50:04 +01:00
|
|
|
|
if (flags == DTOR_FLAG)
|
|
|
|
|
DECL_DESTRUCTOR_P (function) = 1;
|
|
|
|
|
|
1998-05-29 04:33:54 +02:00
|
|
|
|
if (flags == DTOR_FLAG || DECL_CONSTRUCTOR_P (function))
|
1999-11-19 14:03:00 +01:00
|
|
|
|
maybe_retrofit_in_chrg (function);
|
1998-05-29 04:33:54 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (flags == DTOR_FLAG)
|
|
|
|
|
{
|
2000-04-18 22:21:39 +02:00
|
|
|
|
DECL_DESTRUCTOR_P (function) = 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
TYPE_HAS_DESTRUCTOR (ctype) = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create an ARRAY_REF, checking for the user doing things backwards
|
|
|
|
|
along the way. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
tree
|
|
|
|
|
grok_array_decl (array_expr, index_exp)
|
|
|
|
|
tree array_expr, index_exp;
|
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (array_expr);
|
1995-03-16 00:03:59 +01:00
|
|
|
|
tree p1, p2, i1, i2;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
if (type == error_mark_node || index_exp == error_mark_node)
|
|
|
|
|
return error_mark_node;
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (processing_template_decl)
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return build_min (ARRAY_REF, type ? TREE_TYPE (type) : NULL_TREE,
|
|
|
|
|
array_expr, index_exp);
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (type == NULL_TREE)
|
|
|
|
|
{
|
|
|
|
|
/* Something has gone very wrong. Assume we are mistakenly reducing
|
|
|
|
|
an expression instead of a declaration. */
|
1998-09-07 16:25:35 +02:00
|
|
|
|
error ("parser may be lost: is there a '{' missing somewhere?");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (type) == OFFSET_TYPE
|
|
|
|
|
|| TREE_CODE (type) == REFERENCE_TYPE)
|
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
|
|
|
|
|
/* If they have an `operator[]', use that. */
|
cvt.c, [...]: Clean up more old overloading code, old RTTI code, and some formatting quirks.
* cvt.c, decl.c, decl2.c, init.c, rtti.c, typeck.c, typeck2.c,
cp-tree.h: Clean up more old overloading code, old RTTI code, and
some formatting quirks.
From-SVN: r18391
1998-03-03 23:27:04 +01:00
|
|
|
|
if (IS_AGGR_TYPE (type) || IS_AGGR_TYPE (TREE_TYPE (index_exp)))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return build_opfncall (ARRAY_REF, LOOKUP_NORMAL,
|
1994-08-18 22:50:43 +02:00
|
|
|
|
array_expr, index_exp, NULL_TREE);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1998-08-23 14:47:24 +02:00
|
|
|
|
/* Otherwise, create an ARRAY_REF for a pointer or array type. It
|
|
|
|
|
is a little-known fact that, if `a' is an array and `i' is an
|
|
|
|
|
int, you can write `i[a]', which means the same thing as `a[i]'. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1995-03-16 00:03:59 +01:00
|
|
|
|
if (TREE_CODE (type) == ARRAY_TYPE)
|
|
|
|
|
p1 = array_expr;
|
|
|
|
|
else
|
|
|
|
|
p1 = build_expr_type_conversion (WANT_POINTER, array_expr, 0);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1995-03-16 00:03:59 +01:00
|
|
|
|
if (TREE_CODE (TREE_TYPE (index_exp)) == ARRAY_TYPE)
|
|
|
|
|
p2 = index_exp;
|
|
|
|
|
else
|
|
|
|
|
p2 = build_expr_type_conversion (WANT_POINTER, index_exp, 0);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1995-03-16 00:03:59 +01:00
|
|
|
|
i1 = build_expr_type_conversion (WANT_INT | WANT_ENUM, array_expr, 0);
|
|
|
|
|
i2 = build_expr_type_conversion (WANT_INT | WANT_ENUM, index_exp, 0);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1995-03-16 00:03:59 +01:00
|
|
|
|
if ((p1 && i2) && (i1 && p2))
|
1998-09-07 16:25:35 +02:00
|
|
|
|
error ("ambiguous conversion for array subscript");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1995-03-16 00:03:59 +01:00
|
|
|
|
if (p1 && i2)
|
|
|
|
|
array_expr = p1, index_exp = i2;
|
|
|
|
|
else if (i1 && p2)
|
|
|
|
|
array_expr = p2, index_exp = i1;
|
|
|
|
|
else
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("invalid types `%T[%T]' for array subscript",
|
1995-03-16 00:03:59 +01:00
|
|
|
|
type, TREE_TYPE (index_exp));
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (array_expr == error_mark_node || index_exp == error_mark_node)
|
1998-09-07 16:25:35 +02:00
|
|
|
|
error ("ambiguous conversion for array subscript");
|
1995-03-16 00:03:59 +01:00
|
|
|
|
|
|
|
|
|
return build_array_ref (array_expr, index_exp);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given the cast expression EXP, checking out its validity. Either return
|
|
|
|
|
an error_mark_node if there was an unavoidable error, return a cast to
|
|
|
|
|
void for trying to delete a pointer w/ the value 0, or return the
|
|
|
|
|
call to delete. If DOING_VEC is 1, we handle things differently
|
|
|
|
|
for doing an array delete. If DOING_VEC is 2, they gave us the
|
|
|
|
|
array size as an argument to delete.
|
|
|
|
|
Implements ARM $5.3.4. This is called from the parser. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
tree
|
|
|
|
|
delete_sanity (exp, size, doing_vec, use_global_delete)
|
|
|
|
|
tree exp, size;
|
|
|
|
|
int doing_vec, use_global_delete;
|
|
|
|
|
{
|
1998-06-10 05:13:19 +02:00
|
|
|
|
tree t, type;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* For a regular vector delete (aka, no size argument) we will pass
|
|
|
|
|
this down as a NULL_TREE into build_vec_delete. */
|
|
|
|
|
tree maxindex = NULL_TREE;
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
1996-03-23 00:11:55 +01:00
|
|
|
|
if (exp == error_mark_node)
|
|
|
|
|
return exp;
|
|
|
|
|
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (processing_template_decl)
|
1996-02-28 23:01:56 +01:00
|
|
|
|
{
|
|
|
|
|
t = build_min (DELETE_EXPR, void_type_node, exp, size);
|
|
|
|
|
DELETE_EXPR_USE_GLOBAL (t) = use_global_delete;
|
|
|
|
|
DELETE_EXPR_USE_VEC (t) = doing_vec;
|
|
|
|
|
return t;
|
|
|
|
|
}
|
|
|
|
|
|
1998-06-10 05:13:19 +02:00
|
|
|
|
if (TREE_CODE (exp) == OFFSET_REF)
|
|
|
|
|
exp = resolve_offset_ref (exp);
|
|
|
|
|
exp = convert_from_reference (exp);
|
|
|
|
|
t = stabilize_reference (exp);
|
|
|
|
|
t = build_expr_type_conversion (WANT_POINTER, t, 1);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1998-06-10 05:13:19 +02:00
|
|
|
|
if (t == NULL_TREE || t == error_mark_node)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("type `%#T' argument given to `delete', expected pointer",
|
1998-06-10 05:13:19 +02:00
|
|
|
|
TREE_TYPE (exp));
|
|
|
|
|
return error_mark_node;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-06-10 05:13:19 +02:00
|
|
|
|
if (doing_vec == 2)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
2000-06-30 02:26:03 +02:00
|
|
|
|
maxindex = cp_build_binary_op (MINUS_EXPR, size, integer_one_node);
|
1998-09-07 16:25:35 +02:00
|
|
|
|
pedwarn ("anachronistic use of array size in vector delete");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-06-10 05:13:19 +02:00
|
|
|
|
type = TREE_TYPE (t);
|
|
|
|
|
|
|
|
|
|
/* As of Valley Forge, you can delete a pointer to const. */
|
|
|
|
|
|
|
|
|
|
/* You can't delete functions. */
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (type)) == FUNCTION_TYPE)
|
1994-04-08 08:08:43 +02:00
|
|
|
|
{
|
2000-02-21 20:51:44 +01:00
|
|
|
|
error ("cannot delete a function. Only pointer-to-objects are valid arguments to `delete'");
|
1998-06-10 05:13:19 +02:00
|
|
|
|
return error_mark_node;
|
1994-04-08 08:08:43 +02:00
|
|
|
|
}
|
1998-06-10 05:13:19 +02:00
|
|
|
|
|
1999-04-29 10:33:55 +02:00
|
|
|
|
/* Deleting ptr to void is undefined behaviour [expr.delete/3]. */
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (type)) == VOID_TYPE)
|
2000-06-22 22:54:48 +02:00
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
warning ("deleting `%T' is undefined", type);
|
2000-06-22 22:54:48 +02:00
|
|
|
|
doing_vec = 0;
|
|
|
|
|
}
|
|
|
|
|
|
1998-06-10 05:13:19 +02:00
|
|
|
|
/* An array can't have been allocated by new, so complain. */
|
|
|
|
|
if (TREE_CODE (t) == ADDR_EXPR
|
|
|
|
|
&& TREE_CODE (TREE_OPERAND (t, 0)) == VAR_DECL
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (TREE_OPERAND (t, 0))) == ARRAY_TYPE)
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
warning ("deleting array `%#D'", TREE_OPERAND (t, 0));
|
1998-06-10 05:13:19 +02:00
|
|
|
|
|
|
|
|
|
/* Deleting a pointer with the value zero is valid and has no effect. */
|
|
|
|
|
if (integer_zerop (t))
|
|
|
|
|
return build1 (NOP_EXPR, void_type_node, t);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
if (doing_vec)
|
2000-05-25 00:56:54 +02:00
|
|
|
|
return build_vec_delete (t, maxindex, sfk_deleting_destructor,
|
|
|
|
|
use_global_delete);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else
|
2002-03-20 20:50:24 +01:00
|
|
|
|
return build_delete (type, t, sfk_deleting_destructor,
|
|
|
|
|
LOOKUP_NORMAL, use_global_delete);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1997-09-06 10:10:07 +02:00
|
|
|
|
/* Report an error if the indicated template declaration is not the
|
|
|
|
|
sort of thing that should be a member template. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
check_member_template (tmpl)
|
|
|
|
|
tree tmpl;
|
|
|
|
|
{
|
|
|
|
|
tree decl;
|
|
|
|
|
|
|
|
|
|
my_friendly_assert (TREE_CODE (tmpl) == TEMPLATE_DECL, 0);
|
|
|
|
|
decl = DECL_TEMPLATE_RESULT (tmpl);
|
|
|
|
|
|
1998-04-22 00:03:34 +02:00
|
|
|
|
if (TREE_CODE (decl) == FUNCTION_DECL
|
|
|
|
|
|| (TREE_CODE (decl) == TYPE_DECL
|
|
|
|
|
&& IS_AGGR_TYPE (TREE_TYPE (decl))))
|
1997-09-06 10:10:07 +02:00
|
|
|
|
{
|
|
|
|
|
if (current_function_decl)
|
|
|
|
|
/* 14.5.2.2 [temp.mem]
|
|
|
|
|
|
|
|
|
|
A local class shall not have member templates. */
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("invalid declaration of member template `%#D' in local class",
|
1997-09-06 10:10:07 +02:00
|
|
|
|
decl);
|
|
|
|
|
|
1998-04-22 00:03:34 +02:00
|
|
|
|
if (TREE_CODE (decl) == FUNCTION_DECL && DECL_VIRTUAL_P (decl))
|
1997-09-06 10:10:07 +02:00
|
|
|
|
{
|
|
|
|
|
/* 14.5.2.3 [temp.mem]
|
|
|
|
|
|
|
|
|
|
A member function template shall not be virtual. */
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error
|
1998-09-07 16:25:35 +02:00
|
|
|
|
("invalid use of `virtual' in template declaration of `%#D'",
|
1997-09-06 10:10:07 +02:00
|
|
|
|
decl);
|
|
|
|
|
DECL_VIRTUAL_P (decl) = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The debug-information generating code doesn't know what to do
|
|
|
|
|
with member templates. */
|
|
|
|
|
DECL_IGNORED_P (tmpl) = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("template declaration of `%#D'", decl);
|
1997-09-06 10:10:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
cp-tree.h (TYPE_FOR_JAVA): New macro.
d
* cp-tree.h (TYPE_FOR_JAVA): New macro.
* decl.c, cp-tree.h (java_byte_type_node, java_short_type_node,
java_int_type_node, java_long_type_node, java_float_type_node,
java_double_type_node, java_char_type_node, java_boolean_type_node):
New "primitive" types, with predefined names __java_byte etc.
(record_builtin_java_type): New function.
(init_decl_processing): Make Java types with record_builtin_java_type.
(pushtag, grokdeclarator): Set TYPE_FOR_JAVA if in extern "JAVA".
(xref_baseypes): If base class was TYPE_FOR_JAVA, so is this class.
(grokfndecl): Call check_java_method for Java classes.
* method.c (is_java_type): Removed. Replaced with TYPE_FOR_JAVA.
(process_overload_item): Match types against specific
java_XX_type_node types, rather than using is_java_type.
* class.c (finish_struct_1): Don't add default copy constructor
or operator= if TYPE_FOR_JAVA.
(pop_lang_conext): Restore strict_prototyp proper if Java.
* decl2.c (acceptable_java_type, check_java_method): New functions.
* pt.c (instantiate_class_template): Copy TYPE_FOR_JAVA from pattern.
(tsubst): Move common statement after if statement.
* typeck.c (comptypes): If strict, TYPE_FOR_JAVA must match.
From-SVN: r20174
1998-06-01 20:25:34 +02:00
|
|
|
|
/* Return true iff TYPE is a valid Java parameter or return type. */
|
|
|
|
|
|
Warning fixes:
* call.c (op_error): Const-ify a char*.
(add_candidate, source_type, add_warning): Add static prototype.
(print_z_candidates): Const-ify a char*.
* class.c (resolve_address_of_overloaded_function,
fixed_type_or_null, build_vtable_entry_ref): Add static prototype.
(get_vtable_name, finish_struct_1): Const-ify a char*.
* cvt.c (convert_to_reference): Likewise.
* decl.c (redeclaration_error_message, record_builtin_type,
record_unknown_type, member_function_or_else, bad_specifiers):
Likewise.
(find_binding, select_decl, unqualified_namespace_lookup,
lookup_flags, qualify_lookup, record_builtin_java_type, tag_name):
Add static prototype.
(warn_extern_redeclared_static, duplicate_decls, pushdecl,
implicitly_declare, record_builtin_java_type, define_function,
grok_op_properties, tag_name): Const-ify a char*.
* cp-tree.h (FORMAT_VBASE_NAME): Allow parameter `BUF' to be const.
(define_function, finish_builtin_type): Const-ify a char*.
(cp_error, cp_error_at, cp_warning, cp_warning_at, cp_pedwarn,
cp_pedwarn_at, cp_compiler_error, cp_sprintf): Add prototype args.
(file_name_nondirectory): Const-ify a char*.
(init_filename_times): Don't prototype.
(compiler_error): Prototype.
(yyerror, init_repo): Const-ify a char*.
(build_srcloc): Don't prototype.
(build_x_indirect_ref, build_indirect_ref, build_component_addr):
Const-ify a char*.
(warn_for_assignment): Don't prototype.
(convert_for_initialization, readonly_error, check_for_new_type,
GNU_xref_begin, GNU_xref_file, GNU_xref_ref, GNU_xref_call):
Const-ify a char*.
* decl2.c (acceptable_java_type, output_vtable_inherit,
setup_initp, start_objects, finish_objects, do_dtors, do_ctors,
merge_functions, decl_namespace, validate_nonmember_using_decl,
do_nonmember_using_decl): Add static prototype.
(lang_f_options): Const-ify a char*.
(finish_builtin_type): Likewise.
(add_function, arg_assoc_namespace, arg_assoc_class): Add static
prototype.
* errfn.c: Include cp-tree.h.
(cp_thing): Add static prototype.
(compiler_error): Don't protoptype.
(cp_compiler_error): Cast `compiler_error' to `errorfn' before
passing it to `cp_thing'.
* error.c (interesting_scope_p): Add static prototype.
* except.c (build_eh_type_type, build_eh_type_type_ref): Const-ify
a char*.
* init.c (compiler_error): Don't prototype.
(member_init_ok_or_else): Const-ify a char*.
(build_java_class_ref): Add static prototype.
* lex.c (compiler_error): Don't prototype.
(get_time_identifier, interface_strcmp, extend_token_buffer,
handle_cp_pragma): Const-ify a char*.
(is_global, init_filename_times): Add static prototype.
(file_name_nondirectory, cplus_tree_code_name): Const-ify a char*.
(compiler_error): Change from fixed args to variable args.
(yyerror): Const-ify a char*.
* parse.y (cond_stmt_keyword): Const-ify a char*.
(parse_decl): Add static prototype.
* pt.c (template_args_equal, print_template_context): Likewise.
(print_candidates, check_default_tmpl_args): Const-ify a char*.
(instantiate_class_template): Likewise.
* repo.c (get_base_filename, open_repo_file, init_repo): Likewise.
* rtti.c (call_void_fn, expand_generic_desc, expand_si_desc,
expand_class_desc, expand_ptr_desc, expand_attr_desc): Likewise.
* search.c (lookup_field_info, lookup_member): Likewise.
(lookup_member): Cast the first argument of `bzero' to a PTR.
* sig.c (compiler_error): Don't prototype.
(build_signature_pointer_or_reference_nam): Const-ify a char*.
(get_sigtable_name, build_member_function_pointer): Likewise.
* tree.c (compiler_error): Don't prototype.
(no_linkage_helper, build_srcloc): Add static prototype.
(build_vbase_pointer_fields): Const-ify a char*.
(__eprintf): Don't unnecessarily handle `const' when !__STDC__.
* typeck.c (compiler_error): Don't prototype.
(convert_for_assignment): Const-ify a char*.
(comp_cv_target_types): Add static prototype.
(build_x_indirect_ref, build_indirect_ref, convert_arguments,
build_component_addr, build_unary_op, convert_for_initialization):
Const-ify a char*.
* typeck2.c (ack): Add static prototype and change from fixed args
to variable args.
(readonly_error, check_for_new_type): Const-ify a char*.
* xref.c (_XREF_FILE, find_file, filename, fctname, declname,
fixname, open_xref_file, classname, GNU_xref_begin): Likewise.
(GNU_xref_file): Likewise. Also use `xmalloc' instead of `malloc'.
(GNU_xref_end_scope, GNU_xref_ref, GNU_xref_decl, GNU_xref_call,
gen_assign, GNU_xref_member): Const-ify a char*.
From-SVN: r25994
1999-03-26 08:45:00 +01:00
|
|
|
|
static int
|
cp-tree.h (TYPE_FOR_JAVA): New macro.
d
* cp-tree.h (TYPE_FOR_JAVA): New macro.
* decl.c, cp-tree.h (java_byte_type_node, java_short_type_node,
java_int_type_node, java_long_type_node, java_float_type_node,
java_double_type_node, java_char_type_node, java_boolean_type_node):
New "primitive" types, with predefined names __java_byte etc.
(record_builtin_java_type): New function.
(init_decl_processing): Make Java types with record_builtin_java_type.
(pushtag, grokdeclarator): Set TYPE_FOR_JAVA if in extern "JAVA".
(xref_baseypes): If base class was TYPE_FOR_JAVA, so is this class.
(grokfndecl): Call check_java_method for Java classes.
* method.c (is_java_type): Removed. Replaced with TYPE_FOR_JAVA.
(process_overload_item): Match types against specific
java_XX_type_node types, rather than using is_java_type.
* class.c (finish_struct_1): Don't add default copy constructor
or operator= if TYPE_FOR_JAVA.
(pop_lang_conext): Restore strict_prototyp proper if Java.
* decl2.c (acceptable_java_type, check_java_method): New functions.
* pt.c (instantiate_class_template): Copy TYPE_FOR_JAVA from pattern.
(tsubst): Move common statement after if statement.
* typeck.c (comptypes): If strict, TYPE_FOR_JAVA must match.
From-SVN: r20174
1998-06-01 20:25:34 +02:00
|
|
|
|
acceptable_java_type (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (type) == VOID_TYPE || TYPE_FOR_JAVA (type))
|
|
|
|
|
return 1;
|
2001-01-10 20:20:52 +01:00
|
|
|
|
if (TREE_CODE (type) == POINTER_TYPE || TREE_CODE (type) == REFERENCE_TYPE)
|
cp-tree.h (TYPE_FOR_JAVA): New macro.
d
* cp-tree.h (TYPE_FOR_JAVA): New macro.
* decl.c, cp-tree.h (java_byte_type_node, java_short_type_node,
java_int_type_node, java_long_type_node, java_float_type_node,
java_double_type_node, java_char_type_node, java_boolean_type_node):
New "primitive" types, with predefined names __java_byte etc.
(record_builtin_java_type): New function.
(init_decl_processing): Make Java types with record_builtin_java_type.
(pushtag, grokdeclarator): Set TYPE_FOR_JAVA if in extern "JAVA".
(xref_baseypes): If base class was TYPE_FOR_JAVA, so is this class.
(grokfndecl): Call check_java_method for Java classes.
* method.c (is_java_type): Removed. Replaced with TYPE_FOR_JAVA.
(process_overload_item): Match types against specific
java_XX_type_node types, rather than using is_java_type.
* class.c (finish_struct_1): Don't add default copy constructor
or operator= if TYPE_FOR_JAVA.
(pop_lang_conext): Restore strict_prototyp proper if Java.
* decl2.c (acceptable_java_type, check_java_method): New functions.
* pt.c (instantiate_class_template): Copy TYPE_FOR_JAVA from pattern.
(tsubst): Move common statement after if statement.
* typeck.c (comptypes): If strict, TYPE_FOR_JAVA must match.
From-SVN: r20174
1998-06-01 20:25:34 +02:00
|
|
|
|
{
|
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
if (TREE_CODE (type) == RECORD_TYPE)
|
|
|
|
|
{
|
1998-08-20 18:44:01 +02:00
|
|
|
|
tree args; int i;
|
|
|
|
|
if (! TYPE_FOR_JAVA (type))
|
|
|
|
|
return 0;
|
|
|
|
|
if (! CLASSTYPE_TEMPLATE_INFO (type))
|
|
|
|
|
return 1;
|
|
|
|
|
args = CLASSTYPE_TI_ARGS (type);
|
|
|
|
|
i = TREE_VEC_LENGTH (args);
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
type = TREE_VEC_ELT (args, i);
|
|
|
|
|
if (TREE_CODE (type) == POINTER_TYPE)
|
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
if (! TYPE_FOR_JAVA (type))
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
cp-tree.h (TYPE_FOR_JAVA): New macro.
d
* cp-tree.h (TYPE_FOR_JAVA): New macro.
* decl.c, cp-tree.h (java_byte_type_node, java_short_type_node,
java_int_type_node, java_long_type_node, java_float_type_node,
java_double_type_node, java_char_type_node, java_boolean_type_node):
New "primitive" types, with predefined names __java_byte etc.
(record_builtin_java_type): New function.
(init_decl_processing): Make Java types with record_builtin_java_type.
(pushtag, grokdeclarator): Set TYPE_FOR_JAVA if in extern "JAVA".
(xref_baseypes): If base class was TYPE_FOR_JAVA, so is this class.
(grokfndecl): Call check_java_method for Java classes.
* method.c (is_java_type): Removed. Replaced with TYPE_FOR_JAVA.
(process_overload_item): Match types against specific
java_XX_type_node types, rather than using is_java_type.
* class.c (finish_struct_1): Don't add default copy constructor
or operator= if TYPE_FOR_JAVA.
(pop_lang_conext): Restore strict_prototyp proper if Java.
* decl2.c (acceptable_java_type, check_java_method): New functions.
* pt.c (instantiate_class_template): Copy TYPE_FOR_JAVA from pattern.
(tsubst): Move common statement after if statement.
* typeck.c (comptypes): If strict, TYPE_FOR_JAVA must match.
From-SVN: r20174
1998-06-01 20:25:34 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* For a METHOD in a Java class CTYPE, return 1 if
|
|
|
|
|
the parameter and return types are valid Java types.
|
|
|
|
|
Otherwise, print appropriate error messages, and return 0. */
|
|
|
|
|
|
|
|
|
|
int
|
1998-09-25 11:00:04 +02:00
|
|
|
|
check_java_method (method)
|
|
|
|
|
tree method;
|
cp-tree.h (TYPE_FOR_JAVA): New macro.
d
* cp-tree.h (TYPE_FOR_JAVA): New macro.
* decl.c, cp-tree.h (java_byte_type_node, java_short_type_node,
java_int_type_node, java_long_type_node, java_float_type_node,
java_double_type_node, java_char_type_node, java_boolean_type_node):
New "primitive" types, with predefined names __java_byte etc.
(record_builtin_java_type): New function.
(init_decl_processing): Make Java types with record_builtin_java_type.
(pushtag, grokdeclarator): Set TYPE_FOR_JAVA if in extern "JAVA".
(xref_baseypes): If base class was TYPE_FOR_JAVA, so is this class.
(grokfndecl): Call check_java_method for Java classes.
* method.c (is_java_type): Removed. Replaced with TYPE_FOR_JAVA.
(process_overload_item): Match types against specific
java_XX_type_node types, rather than using is_java_type.
* class.c (finish_struct_1): Don't add default copy constructor
or operator= if TYPE_FOR_JAVA.
(pop_lang_conext): Restore strict_prototyp proper if Java.
* decl2.c (acceptable_java_type, check_java_method): New functions.
* pt.c (instantiate_class_template): Copy TYPE_FOR_JAVA from pattern.
(tsubst): Move common statement after if statement.
* typeck.c (comptypes): If strict, TYPE_FOR_JAVA must match.
From-SVN: r20174
1998-06-01 20:25:34 +02:00
|
|
|
|
{
|
|
|
|
|
int jerr = 0;
|
|
|
|
|
tree arg_types = TYPE_ARG_TYPES (TREE_TYPE (method));
|
|
|
|
|
tree ret_type = TREE_TYPE (TREE_TYPE (method));
|
|
|
|
|
if (! acceptable_java_type (ret_type))
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("Java method '%D' has non-Java return type `%T'",
|
cp-tree.h (TYPE_FOR_JAVA): New macro.
d
* cp-tree.h (TYPE_FOR_JAVA): New macro.
* decl.c, cp-tree.h (java_byte_type_node, java_short_type_node,
java_int_type_node, java_long_type_node, java_float_type_node,
java_double_type_node, java_char_type_node, java_boolean_type_node):
New "primitive" types, with predefined names __java_byte etc.
(record_builtin_java_type): New function.
(init_decl_processing): Make Java types with record_builtin_java_type.
(pushtag, grokdeclarator): Set TYPE_FOR_JAVA if in extern "JAVA".
(xref_baseypes): If base class was TYPE_FOR_JAVA, so is this class.
(grokfndecl): Call check_java_method for Java classes.
* method.c (is_java_type): Removed. Replaced with TYPE_FOR_JAVA.
(process_overload_item): Match types against specific
java_XX_type_node types, rather than using is_java_type.
* class.c (finish_struct_1): Don't add default copy constructor
or operator= if TYPE_FOR_JAVA.
(pop_lang_conext): Restore strict_prototyp proper if Java.
* decl2.c (acceptable_java_type, check_java_method): New functions.
* pt.c (instantiate_class_template): Copy TYPE_FOR_JAVA from pattern.
(tsubst): Move common statement after if statement.
* typeck.c (comptypes): If strict, TYPE_FOR_JAVA must match.
From-SVN: r20174
1998-06-01 20:25:34 +02:00
|
|
|
|
method, ret_type);
|
|
|
|
|
jerr++;
|
|
|
|
|
}
|
|
|
|
|
for (; arg_types != NULL_TREE; arg_types = TREE_CHAIN (arg_types))
|
|
|
|
|
{
|
|
|
|
|
tree type = TREE_VALUE (arg_types);
|
|
|
|
|
if (! acceptable_java_type (type))
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("Java method '%D' has non-Java parameter type `%T'",
|
cp-tree.h (TYPE_FOR_JAVA): New macro.
d
* cp-tree.h (TYPE_FOR_JAVA): New macro.
* decl.c, cp-tree.h (java_byte_type_node, java_short_type_node,
java_int_type_node, java_long_type_node, java_float_type_node,
java_double_type_node, java_char_type_node, java_boolean_type_node):
New "primitive" types, with predefined names __java_byte etc.
(record_builtin_java_type): New function.
(init_decl_processing): Make Java types with record_builtin_java_type.
(pushtag, grokdeclarator): Set TYPE_FOR_JAVA if in extern "JAVA".
(xref_baseypes): If base class was TYPE_FOR_JAVA, so is this class.
(grokfndecl): Call check_java_method for Java classes.
* method.c (is_java_type): Removed. Replaced with TYPE_FOR_JAVA.
(process_overload_item): Match types against specific
java_XX_type_node types, rather than using is_java_type.
* class.c (finish_struct_1): Don't add default copy constructor
or operator= if TYPE_FOR_JAVA.
(pop_lang_conext): Restore strict_prototyp proper if Java.
* decl2.c (acceptable_java_type, check_java_method): New functions.
* pt.c (instantiate_class_template): Copy TYPE_FOR_JAVA from pattern.
(tsubst): Move common statement after if statement.
* typeck.c (comptypes): If strict, TYPE_FOR_JAVA must match.
From-SVN: r20174
1998-06-01 20:25:34 +02:00
|
|
|
|
method, type);
|
|
|
|
|
jerr++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return jerr ? 0 : 1;
|
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Sanity check: report error if this function FUNCTION is not
|
|
|
|
|
really a member of the class (CTYPE) it is supposed to belong to.
|
|
|
|
|
CNAME is the same here as it is for grokclassfn above. */
|
|
|
|
|
|
1995-10-12 03:33:51 +01:00
|
|
|
|
tree
|
1996-02-28 23:01:56 +01:00
|
|
|
|
check_classfn (ctype, function)
|
|
|
|
|
tree ctype, function;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
tree fn_name = DECL_NAME (function);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
tree fndecl, fndecls;
|
1996-02-28 23:01:56 +01:00
|
|
|
|
tree method_vec = CLASSTYPE_METHOD_VEC (complete_type (ctype));
|
1994-02-24 02:02:37 +01:00
|
|
|
|
tree *methods = 0;
|
|
|
|
|
tree *end = 0;
|
1999-02-21 17:38:23 +01:00
|
|
|
|
|
|
|
|
|
if (DECL_USE_TEMPLATE (function)
|
2000-03-12 19:47:52 +01:00
|
|
|
|
&& !(TREE_CODE (function) == TEMPLATE_DECL
|
|
|
|
|
&& DECL_TEMPLATE_SPECIALIZATION (function))
|
1999-02-21 17:38:23 +01:00
|
|
|
|
&& is_member_template (DECL_TI_TEMPLATE (function)))
|
|
|
|
|
/* Since this is a specialization of a member template,
|
|
|
|
|
we're not going to find the declaration in the class.
|
|
|
|
|
For example, in:
|
|
|
|
|
|
|
|
|
|
struct S { template <typename T> void f(T); };
|
|
|
|
|
template <> void S::f(int);
|
|
|
|
|
|
|
|
|
|
we're not going to find `S::f(int)', but there's no
|
|
|
|
|
reason we should, either. We let our callers know we didn't
|
|
|
|
|
find the method, but we don't complain. */
|
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (method_vec != 0)
|
|
|
|
|
{
|
|
|
|
|
methods = &TREE_VEC_ELT (method_vec, 0);
|
|
|
|
|
end = TREE_VEC_END (method_vec);
|
|
|
|
|
|
|
|
|
|
/* First suss out ctors and dtors. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (*methods && fn_name == DECL_NAME (OVL_CURRENT (*methods))
|
1996-03-21 20:46:11 +01:00
|
|
|
|
&& DECL_CONSTRUCTOR_P (function))
|
|
|
|
|
goto got_it;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (*++methods && fn_name == DECL_NAME (OVL_CURRENT (*methods))
|
2000-04-18 22:21:39 +02:00
|
|
|
|
&& DECL_DESTRUCTOR_P (function))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
goto got_it;
|
|
|
|
|
|
1998-10-06 16:20:30 +02:00
|
|
|
|
while (++methods != end && *methods)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1997-09-06 10:10:07 +02:00
|
|
|
|
fndecl = *methods;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (fn_name == DECL_NAME (OVL_CURRENT (*methods)))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
got_it:
|
1998-05-08 04:06:26 +02:00
|
|
|
|
for (fndecls = *methods; fndecls != NULL_TREE;
|
|
|
|
|
fndecls = OVL_NEXT (fndecls))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1998-05-08 04:06:26 +02:00
|
|
|
|
fndecl = OVL_CURRENT (fndecls);
|
Support for friend templates.
* typeck.c (build_x_function_call): Handle static member function
templates like non-templates. Handle friend templates like normal
function templates.
* pt.c (tsubst, *_PARM): Don't use orig_level.
(get_bindings): Don't call add_to_template_args.
(instantiate_template): Likewise.
(tsubst, FUNCTION_DECL): Call add_to_template_args as appropriate.
* ptree.c (print_lang_type): Print index/level for template parms.
* Make-lang.in (cc1plus): Note that cc1plus depends on
cp/cp-tree.h and cp/cp-tree.def.
* cp-tree.def (TEMPLATE_CONST_PARM): Remove.
(TEMPLATE_PARM_INDEX): New tree code, used to indicate a
position in a template parameter list.
* cp-tree.h (template_parm_index): New structure, used as the tree
structure for a TEMPLATE_PARM_INDEX.
(TEMPLATE_PARM_IDX): New macro.
(TEMPLATE_PARM_LEVEL): Likewise.
(TEMPLATE_PARM_DESCENDANTS): Likewise.
(TEMPLATE_PARM_ORIG_LEVEL): Likewise.
(TEMPLATE_PARM_DECL): Likewise.
(TEMPLATE_TYPE_PARM_INDEX): Likewise.
(TEMPLATE_TYPE_ORIG_LEVEL): Likewise.
(TEMPLATE_TYPE_DECL): Likewise.
(TEMPLATE_CONST_IDX): Remove.
(TEMPLATE_CONST_LEVEL): Likewise.
(TEMPLATE_CONST_SET_INFO): Likewise.
(TEMPLATE_TYPE_SET_INFO): Likewise.
(TEMPLATE_TYPE_IDX): Redefine in terms of TEMPLATE_PARM_INDEX
node.
(TEMPLATE_TYPE_LEVEL): Likewise.
* decl.c (decls_match): Call comp_template_parms, rather than
expanding it inline.
(duplicate_decls): If two template declarations are being merged,
then their TEMPLATE_INFOs should be merged as well.
(grokfndecl): Save template-id information when declaring a friend
with explicit template arguments. Pass arguments to
check_explicit_specialization via correct convention; at some
point check_explicit_specialization changed, but these call-sites
did not.
(grokdeclarator): Tidy up slightly.
* decl2.c (check_classfn): Tidy up slightly. Don't assume that
two template functions with the same DECL_ASSEMBLER_NAME the same,
since the names are not yet mangled.
* error.c (dump_decl): Use TEMPLATE_PARM_INDEX instead of
TEMPLATE_CONST_PARM.
(dump_expr): Likewise. Use the TEMPLATE_PARM_DECL to get at the
decl for a non-type parameter, rather than printing `<tparm ...>'.
* friend.c (is_friend): Handle TEMPLATE_DECL friends.
(do_friend): Deal with template friends.
* lex.c (do_pending_inlines): Call
maybe_begin_member_template_processing, rather than
conditionally calling begin_member_template_processing.
(process_next_inline): Likewise. Call
maybe_end_member_template_processing, rather than
conditionally calling end_member_template_processing.
(do_pending_defargs): Likewise.
(do_identifier): Use TEMPLATE_PARM_INDEX instead of
TEMPLATE_CONST_PARM.
* method.c (build_mangled_template_parm_index): New function.
(build_overload_value): Use it.
(build_overload_name): Likewise.
* pt.c (finish_member_template_decl): Allow friend declarations.
(template_class_depth): New function.
(is_member_template): Rename, and modify, to become...
(is_member_or_friend_template): New function.
(end_member_template_processing): Rename, and modify, to become...
(maybe_end_member_template_processing).
(build_template_parm_index): New function.
(reduce_template_parm_level): New function.
(process_template_parm): Modify to use build_template_parm_index.
(current_template_args): Change name to current_template_parms.
(push_template_decl): Deal with friend templates.
(uses_template_parms): Use TEMPLATE_PARM_INDEX instead of
TEMPLATE_CONST_PARM.
(tsubst_friend_function): New function.
(instantiate_class_template): Generate the DECL_FRIENDLIST
for a new instantiation by using tsubst_friend_function rather
than just tsubst.
(tsubst): Don't tsubst into a type which is a TEMPLATE_DECL.
Use TEMPLATE_PARM_INDEX instead of TEMPLATE_CONST_PARM, and the
appropriate new macros. Use reduce_template_parm_level to
generate lower-level template parameters. Handle tsubst'ing into
TEMPLATE_DECLS that declare TEMPLATE_TEMPLATE_PARMS. Don't forget
to tsubst the DECL_CONTEXT and DECL_CLASS_CONTEXT of newly created
templates. Similarly for the template parameters for a new
template.
(tsubst_copy): Tidy up slightly. Use TEMPLATE_PARM_INDEX instead
of TEMPLATE_CONST_PARM. Handle TYPE_DECLs by tsubsting into them.
(unify): Use TEMPLATE_PARM_INDEX instead of TEMPLATE_CONST_PARM.
(get_bindings): Call add_to_template_args if necessary.
(instantiate_decl): Handle instantiations of friend templates.
* search.c (lookup_field_1): Don't treat the TYPE_FIELDS of a
TEMPLATE_TYPE_PARM as a list of fields; it's not!
* spew.c (yylex): Do a little manual constant propogation to
clarify the code.
From-SVN: r18198
1998-02-23 04:17:44 +01:00
|
|
|
|
|
|
|
|
|
/* We cannot simply call decls_match because this
|
|
|
|
|
doesn't work for static member functions that are
|
|
|
|
|
pretending to be methods, and because the name
|
|
|
|
|
may have been changed by asm("new_name"). */
|
1994-12-30 22:03:40 +01:00
|
|
|
|
if (DECL_NAME (function) == DECL_NAME (fndecl))
|
|
|
|
|
{
|
|
|
|
|
tree p1 = TYPE_ARG_TYPES (TREE_TYPE (function));
|
|
|
|
|
tree p2 = TYPE_ARG_TYPES (TREE_TYPE (fndecl));
|
|
|
|
|
|
|
|
|
|
/* Get rid of the this parameter on functions that become
|
1996-07-11 03:13:25 +02:00
|
|
|
|
static. */
|
1994-12-30 22:03:40 +01:00
|
|
|
|
if (DECL_STATIC_FUNCTION_P (fndecl)
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (function)) == METHOD_TYPE)
|
|
|
|
|
p1 = TREE_CHAIN (p1);
|
|
|
|
|
|
1998-11-01 16:45:11 +01:00
|
|
|
|
if (same_type_p (TREE_TYPE (TREE_TYPE (function)),
|
|
|
|
|
TREE_TYPE (TREE_TYPE (fndecl)))
|
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals.
* cplus-dem.c (work_stuff): Replace const_type and volatile_type
with type_quals.
(TYPE_UNQUALIFIED): New macro.
(TYPE_QUAL_CONST): Likewise.
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(code_for_qualifier): New function.
(qualifier_string): Likewise.
(demangle_qualifier): Likewise.
(internal_cplus_demangle): Use them.
(demangle_signature): Likewise.
(demangle_template_value_parm): Likewise.
(do_type): Likewise.
(demangle_fund_type)): Likewise.
* Makefile.in (hash.h): Run gperf when necessary.
* cp-tree.h (CP_TYPE_READONLY): Remove.
(CP_TYPE_VOLATILE): Likewise.
(CP_TYPE_QUALS): New macro.
(CP_TYPE_CONST_P): Likewise.
(CP_TYPE_VOLATILE_P): Likewise.
(CP_TYPE_RESTRICT_P): Likewise.
(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Declare.
(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
(cp_type_qual_from_rid): New function.
(compparms): Remove unused parameter. All callers changed.
(cp_type_quals): New function.
(at_least_as_qualified_p): Likewise.
(more_qualified_p): Likewise.
* call.c (standard_conversion): Replace calls to
cp_build_type_variant with cp_build_qualified_type. Use
CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
compare them. Use CP_TYPE_* macros to check qualifiers.
(reference_binding): Likewise.
(implicit_conversion): Likewise.
(add_builtin_candidates): Likewise.
(build_over_call): Likewise.
* class.c (overrides): Compare all qualifiers, not just `const',
on method declarations.
* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
(convert_pointer_to_real): Likewise.
(type_promotes_to): Likewise.
* decl.c (check_for_uninitialized_const_var): New function.
(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
(cp_finish_decl): Use check_for_uninitialized_const_var.
(grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to
handle `restrict'.
(grok_ctor_properties): Likewise.
(grok_op_properties): Likewise.
(start_function): Likewise.
(rever_static_member_fn): Likewise.
* decl2.c (grok_method_quals): Likewise.
(grokfield): Likewise.
* error.c (dump_readonly_or_volatile): Rename to ...
(dump_qualifiers): New function. Handle `restrict'.
(dump_type_real): Use it.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_function_decl): Likewise.
(cv_as_string): Likewise.
* gxx.gperf: Add __restrict and __restrict__.
* gxxint.texi: Document `u' as used for `__restrict', and a few
other previously undocumented codes.
* hash.h: Regenerated.
* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
(build_member_call): Likewise.
(build_new_1): Likewise.
* lex.c (init_parse): Add entry for RID_RESTRICT.
(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
(cp_type_qual_from_rid): Define.
* lex.h (enum rid): Add RID_RESTRICT.
* method.c (process_modifiers): Deal with `restrict'.
* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
* parse.c: Regenerated.
* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
(tsubst_aggr_type): Likewise.
(tsubst): Likewise.
(check_cv_quals_for_unify): Likewise.
(unify): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(get_tinfo_var): Likewise.
(buidl_dynamic_cast_1): Likewise. Fix `volatile' handling.
(expand_class_desc): Likewise.
(expand_attr_desc): Likewise.
(synthesize_tinfo_fn): Likewise.
* search.c (covariant_return_p): Likewise. Fix `volatile' handling.
(get_matching_virtual): Likewise.
(expand_upcast_fixups): Likewise.
* sig.c (build_signature_pointer_or_reference_name): Take
type_quals, not constp and volatilep.
(build_signature_pointer_or_reference_type): Likewise.
(match_method_types): More CP_TYPE_QUALS conversion, etc.
(build_signature_pointer_constructor): Likewise.
(build_signature_method_call): Likewise.
* tree.c (build_cplus_array_type): Likewise.
(cp_build_type_variant): Rename to ...
(cp_build_qualified_type): New function. Deal with `__restrict'.
(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
(build_exception_variant): Likewise.
(mapcar): Likewise.
* typeck.c (qualif_type): Likewise.
(common_type): Likewise.
(comptypes): Likewise.
(comp_cv_target_types): Likewise.
(at_least_as_qualified_p): Define.
(more_qualified_p): Likewise.
(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
(compparms): Likewise.
(inline_conversion): Likewise.
(string_conv_p): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_array_ref): Likewise.
(build_unary_op): Likewise.
(build_conditional_expr): Likewise.
(build_static_cast): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_For_assignment): Likewise.
(comp_ptr_ttypes_real): Likewise.
(cp_type_quals): New function.
From-SVN: r23258
1998-10-23 16:53:28 +02:00
|
|
|
|
&& compparms (p1, p2)
|
1997-09-28 21:16:59 +02:00
|
|
|
|
&& (DECL_TEMPLATE_SPECIALIZATION (function)
|
|
|
|
|
== DECL_TEMPLATE_SPECIALIZATION (fndecl))
|
|
|
|
|
&& (!DECL_TEMPLATE_SPECIALIZATION (function)
|
|
|
|
|
|| (DECL_TI_TEMPLATE (function)
|
|
|
|
|
== DECL_TI_TEMPLATE (fndecl))))
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return fndecl;
|
1994-12-30 22:03:40 +01:00
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
break; /* loser */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-06 16:20:30 +02:00
|
|
|
|
if (methods != end && *methods)
|
1995-10-12 03:33:51 +01:00
|
|
|
|
{
|
|
|
|
|
tree fndecl = *methods;
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("prototype for `%#D' does not match any in class `%T'",
|
1995-10-12 03:33:51 +01:00
|
|
|
|
function, ctype);
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_error_at ("candidate%s: %+#D", OVL_NEXT (fndecl) ? "s are" : " is",
|
1998-05-08 04:06:26 +02:00
|
|
|
|
OVL_CURRENT (fndecl));
|
|
|
|
|
while (fndecl = OVL_NEXT (fndecl), fndecl)
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_error_at (" %#D", OVL_CURRENT(fndecl));
|
1995-10-12 03:33:51 +01:00
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
methods = 0;
|
tree.h (COMPLETE_TYPE_P): New macro.
gcc
* tree.h (COMPLETE_TYPE_P): New macro.
(COMPLETE_OR_VOID_TYPE_P): New macro.
(COMPLETE_OR_UNBOUND_ARRAY_TYPE_P): New macro.
* stor-layout.c (layout_type, case VOID_TYPE): Don't set TYPE_SIZE.
* c-aux-info.c (gen_type): Use them.
* c-common.c (c_expand_expr_stmt): Likewise.
* c-decl.c (poplevel, pushdecl, start_decl, finish_decl,
grokdeclarator, grokparms, finish_struct, start_function,
store_parm_decls, combine_parm_decls): Likewise.
* c-parse.y (cast_expr): Likewise.
* c-typeck.c (require_complete_type, c_sizeof, c_sizeof_nowarn,
c_size_in_bytes, c_alignof, build_component_ref,
build_indirect_ref, build_array_ref, convert_arguments,
build_binary_op, pointer_diff, build_unary_op, digest_init: Likewise.
* calls.c (initialize_argument_information): Likewise.
* convert.c (convert_to_integer): Likewise.
* dbxout.c (dbxout_typedefs, dbxout_type, dbxout_symbol): Likewise.
* dwarfout.c (location_or_const_value_attribute,
output_enumeration_type_die, output_structure_type_die,
output_union_type_die, output_type): Likewise.
* expr.c (safe_from_p, expand_expr): Likewise.
* function.c (assign_parms): Likewise.
* sdbout.c (sdbout_symbol, sdbout_one_type): Likewise.
* tree.c (build_array_type, build_function_type,
build_method_type, build_offset_type, build_complex_type): Likewise.
* c-parse.c, c-parse.h: Regenerated.
gcc/cp
* typeck.c (require_complete_type, complete_type,
complete_type_or_else, c_sizeof, c_sizeof_nowarn,
build_array_ref, convert_arguments, pointer_diff,
build_x_unary_op, build_unary_op, build_c_cast,
build_modify_expr): Use COMPLETE_TYPE_P etc.
* call.c (is_complete, convert_like_real,
build_new_method_call): Likewise.
* class.c (build_vbase_pointer_fields, check_bases,
build_base_field, finish_struct_1, pushclass): Likewise.
* cvt.c (cp_convert_to_pointer, convert_to_void): Likewise.
* decl.c (maybe_process_template_type_declaration, pushtag,
pushdecl, redeclaration_error_message, start_decl, start_decl_1,
layout_var_decl, check_initializer, cp_finish_decl,
grokdeclarator, require_complete_types_for_parms,
grok_op_properties, xref_tag, xref_basetypes,
check_function_type): Likewise.
* decl2.c (check_classfn, reparse_absdcl_as_casts): Likewise.
* friend.c (do_friend): Likewise.
* init.c (build_offset_ref): Likewise.
* parse.y (structsp): Likewise.
* pt.c (maybe_process_partial_specialization,
tsubst_friend_function, instantiate_class_template, tsubst,
do_type_instantiation, instantiate_pending_templates): Likewise.
* repo.c (repo_get_id): Likewise.
* rtti.c (build_typeid, get_typeid, build_dynamic_cast_1,
synthesize_tinfo_var, emit_support_tinfos): Likewise.
* search.c (lookup_fnfields_1, lookup_conversions): Likewise.
* semantics.c (begin_class_definition): Likewise.
* tree.c (build_cplus_method_type): Likewise.
* typeck2.c (digest_init, build_functional_cast,
add_exception_specifier): Likewise.
* parse.h, parse.c: Regenerated.
From-SVN: r32671
2000-03-21 19:10:48 +01:00
|
|
|
|
if (!COMPLETE_TYPE_P (ctype))
|
2002-04-18 19:54:11 +02:00
|
|
|
|
cxx_incomplete_type_error (function, ctype);
|
1999-01-18 13:49:20 +01:00
|
|
|
|
else
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("no `%#D' member function declared in class `%T'",
|
1999-01-18 13:49:20 +01:00
|
|
|
|
function, ctype);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-03-21 20:46:11 +01:00
|
|
|
|
/* If we did not find the method in the class, add it to avoid
|
1998-10-16 14:08:01 +02:00
|
|
|
|
spurious errors (unless the CTYPE is not yet defined, in which
|
|
|
|
|
case we'll only confuse ourselves when the function is declared
|
|
|
|
|
properly within the class. */
|
tree.h (COMPLETE_TYPE_P): New macro.
gcc
* tree.h (COMPLETE_TYPE_P): New macro.
(COMPLETE_OR_VOID_TYPE_P): New macro.
(COMPLETE_OR_UNBOUND_ARRAY_TYPE_P): New macro.
* stor-layout.c (layout_type, case VOID_TYPE): Don't set TYPE_SIZE.
* c-aux-info.c (gen_type): Use them.
* c-common.c (c_expand_expr_stmt): Likewise.
* c-decl.c (poplevel, pushdecl, start_decl, finish_decl,
grokdeclarator, grokparms, finish_struct, start_function,
store_parm_decls, combine_parm_decls): Likewise.
* c-parse.y (cast_expr): Likewise.
* c-typeck.c (require_complete_type, c_sizeof, c_sizeof_nowarn,
c_size_in_bytes, c_alignof, build_component_ref,
build_indirect_ref, build_array_ref, convert_arguments,
build_binary_op, pointer_diff, build_unary_op, digest_init: Likewise.
* calls.c (initialize_argument_information): Likewise.
* convert.c (convert_to_integer): Likewise.
* dbxout.c (dbxout_typedefs, dbxout_type, dbxout_symbol): Likewise.
* dwarfout.c (location_or_const_value_attribute,
output_enumeration_type_die, output_structure_type_die,
output_union_type_die, output_type): Likewise.
* expr.c (safe_from_p, expand_expr): Likewise.
* function.c (assign_parms): Likewise.
* sdbout.c (sdbout_symbol, sdbout_one_type): Likewise.
* tree.c (build_array_type, build_function_type,
build_method_type, build_offset_type, build_complex_type): Likewise.
* c-parse.c, c-parse.h: Regenerated.
gcc/cp
* typeck.c (require_complete_type, complete_type,
complete_type_or_else, c_sizeof, c_sizeof_nowarn,
build_array_ref, convert_arguments, pointer_diff,
build_x_unary_op, build_unary_op, build_c_cast,
build_modify_expr): Use COMPLETE_TYPE_P etc.
* call.c (is_complete, convert_like_real,
build_new_method_call): Likewise.
* class.c (build_vbase_pointer_fields, check_bases,
build_base_field, finish_struct_1, pushclass): Likewise.
* cvt.c (cp_convert_to_pointer, convert_to_void): Likewise.
* decl.c (maybe_process_template_type_declaration, pushtag,
pushdecl, redeclaration_error_message, start_decl, start_decl_1,
layout_var_decl, check_initializer, cp_finish_decl,
grokdeclarator, require_complete_types_for_parms,
grok_op_properties, xref_tag, xref_basetypes,
check_function_type): Likewise.
* decl2.c (check_classfn, reparse_absdcl_as_casts): Likewise.
* friend.c (do_friend): Likewise.
* init.c (build_offset_ref): Likewise.
* parse.y (structsp): Likewise.
* pt.c (maybe_process_partial_specialization,
tsubst_friend_function, instantiate_class_template, tsubst,
do_type_instantiation, instantiate_pending_templates): Likewise.
* repo.c (repo_get_id): Likewise.
* rtti.c (build_typeid, get_typeid, build_dynamic_cast_1,
synthesize_tinfo_var, emit_support_tinfos): Likewise.
* search.c (lookup_fnfields_1, lookup_conversions): Likewise.
* semantics.c (begin_class_definition): Likewise.
* tree.c (build_cplus_method_type): Likewise.
* typeck2.c (digest_init, build_functional_cast,
add_exception_specifier): Likewise.
* parse.h, parse.c: Regenerated.
From-SVN: r32671
2000-03-21 19:10:48 +01:00
|
|
|
|
if (COMPLETE_TYPE_P (ctype))
|
2000-08-04 20:41:00 +02:00
|
|
|
|
add_method (ctype, function, /*error_p=*/1);
|
1995-10-12 03:33:51 +01:00
|
|
|
|
return NULL_TREE;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-19 14:23:55 +02:00
|
|
|
|
/* We have just processed the DECL, which is a static data member.
|
|
|
|
|
Its initializer, if present, is INIT. The ASMSPEC_TREE, if
|
|
|
|
|
present, is the assembly-language name for the data member.
|
1999-11-14 21:29:06 +01:00
|
|
|
|
FLAGS is as for cp_finish_decl. */
|
1999-04-19 14:23:55 +02:00
|
|
|
|
|
|
|
|
|
void
|
1999-11-14 21:29:06 +01:00
|
|
|
|
finish_static_data_member_decl (decl, init, asmspec_tree, flags)
|
1999-04-19 14:23:55 +02:00
|
|
|
|
tree decl;
|
|
|
|
|
tree init;
|
|
|
|
|
tree asmspec_tree;
|
|
|
|
|
int flags;
|
|
|
|
|
{
|
|
|
|
|
my_friendly_assert (TREE_PUBLIC (decl), 0);
|
|
|
|
|
|
2000-06-04 23:12:27 +02:00
|
|
|
|
DECL_CONTEXT (decl) = current_class_type;
|
|
|
|
|
|
1999-04-19 14:23:55 +02:00
|
|
|
|
/* We cannot call pushdecl here, because that would fill in the
|
2001-03-22 01:55:13 +01:00
|
|
|
|
TREE_CHAIN of our decl. Instead, we modify cp_finish_decl to do
|
1999-04-19 14:23:55 +02:00
|
|
|
|
the right thing, namely, to put this decl out straight away. */
|
|
|
|
|
/* current_class_type can be NULL_TREE in case of error. */
|
Compute DECL_ASSEMBLER_NAME lazily.
* tree.h (DECL_ASSEMBLER_NAME): Compute it lazily.
(DECL_ASSEMBLER_NAME_SET_P): New macro.
(SET_DECL_ASSEMBLER_NAME): Likewise.
(COPY_DECL_ASSEMBLER_NAME): Likewise.
(set_decl_assembler_name): Declare.
(lang_set_decl_assembler_name): Likewise.
* tree.c (lang_set_decl_assembler_name): New variab.e
(set_decl_assembler_name): New function.
(init_obstacks): Set lang_set_decl_assembler_name.
(build_decl): Don't set DECL_ASSEMBLER_NAME.
* c-decl.c (duplicate_decls): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(builtin_function): Likewise.
(finish_decl): Likewise.
* dbxout.c (dbxout_type_methods): Likewise.
* ggc-common.c (ggc_mark_trees): Likewise.
* profile.c (output_func_start_profiler): Likewise.
* varasm.c (make_decl_rtl): Likewise.
* class.c (get_vtable_decl): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(add_method): Remove optimization involving comparison of
DECL_ASSEMBLER_NAME.
(build_vtbl_or_vbase_field): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(check_methods): Likewise.
(build_clone): Likewise.
(built_vtt): Likewise.
* cp-tree.h (DECL_NEEDED_P): Likewise.
* decl.c (pushtag): Likewise.
(duplicate_decls): Likewise.
(pushdecl): Likewise.
(builtin_function): Likewise.
(build_library_fn_1): Set DECL_LANGUAGE for library functions.
(build_cp_library_fn): Likewise.
(maybe_commonize_var): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(make_rtl_for_nonlocal_decl): Likewise.
(cp_finish_decl): Likewise.
(grokfndecl): Likewise.
(grokvardecl): Likewise.
(grokdeclarator): Likewise.
(start_function): Likewise.
(cp_missing_return_ok_p): Likewise.
* decl2.c (grokclassfn): Likewise.
(check_classfn): Likewise.
(finish_static_data_member_decl): Likewise.
(grokfield): Likewise.
* error.c (GLOBAL_IORD_P): Remove.
(dump_global_iord): Improve output.
(dump_decl): Avoid using DECL_ASSEMBLER_NAME.
* except.c (nothrow_libfn_p): Summarily reject any function not in
namespace-scope.
* init.c (build_java_class_ref): Don't explicitly set
DECL_ASSEMBLER_NAME after calling mangle_decl.
* mangle.c (mangle_decl_string): Handle extern "C" functions.
(mangle_decl): Set the DECL_ASSEMBLER_NAME for the decl.
* method.c (set_mangled_name_for_decl): Don't explicitly set
DECL_ASSEMBLER_NAME after calling mangle_decl.
(make_thunk): Explicitly set the DECL_ASSEMBLER_NAME and
IDENTIFIER_GLOBAL_VALUE for the thunk.
* pt.c (set_mangled_name_for_template_decl): Remove.
(check_explicit_specialization): Don't use it.
(looup_template_class): Don't set DECL_ASSEMBLER_NAME.
(tsubst_friend_function): Likewise.
(tsubst_decl): Likewise.
(regenerate_decl_from_template): Use COPY_DECL_ASSEMBLER_NAME.
* rtti.c (get_tinfo_decl): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(tinfo_base_init): Likewise.
(create_real_tinfo_var): Likewise.
* search.c (looup_field_1): Likewise.
* semantics.c (finish_named_return_value): Likewise.
* tree.c (init_tree): Set lang_set_decl_assembler_name.
* com.c (builtin_function): Use SET_DECL_ASSEMBLER_NAME.
* class.c (build_class_ref): Use SET_DECL_ASSEMBLER_NAME.
(layout_class): Likewise.
(layout_class_method): Likewise.
(emit_register_classes): Likewise.
* decl.c (builtin_function): Likewise.
(give_name_to_locals): Likewise.
From-SVN: r40642
2001-03-20 00:50:04 +01:00
|
|
|
|
if (!asmspec_tree && current_class_type)
|
|
|
|
|
DECL_INITIAL (decl) = error_mark_node;
|
|
|
|
|
|
1999-04-19 14:23:55 +02:00
|
|
|
|
if (! processing_template_decl)
|
1999-04-23 01:13:12 +02:00
|
|
|
|
{
|
|
|
|
|
if (!pending_statics)
|
|
|
|
|
VARRAY_TREE_INIT (pending_statics, 32, "pending_statics");
|
1999-12-05 01:37:56 +01:00
|
|
|
|
VARRAY_PUSH_TREE (pending_statics, decl);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-02-01 16:50:01 +01:00
|
|
|
|
if (LOCAL_CLASS_P (current_class_type))
|
|
|
|
|
pedwarn ("local class `%#T' shall not have static data member `%#D'",
|
|
|
|
|
current_class_type, decl);
|
|
|
|
|
|
1999-04-19 14:23:55 +02:00
|
|
|
|
/* Static consts need not be initialized in the class definition. */
|
|
|
|
|
if (init != NULL_TREE && TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (decl)))
|
|
|
|
|
{
|
2000-09-06 10:53:45 +02:00
|
|
|
|
static int explained = 0;
|
1999-04-19 14:23:55 +02:00
|
|
|
|
|
|
|
|
|
error ("initializer invalid for static member with constructor");
|
2000-09-06 10:53:45 +02:00
|
|
|
|
if (!explained)
|
|
|
|
|
{
|
|
|
|
|
error ("(an out of class initialization is required)");
|
|
|
|
|
explained = 1;
|
|
|
|
|
}
|
|
|
|
|
init = NULL_TREE;
|
1999-04-19 14:23:55 +02:00
|
|
|
|
}
|
|
|
|
|
/* Force the compiler to know when an uninitialized static const
|
|
|
|
|
member is being used. */
|
|
|
|
|
if (CP_TYPE_CONST_P (TREE_TYPE (decl)) && init == 0)
|
|
|
|
|
TREE_USED (decl) = 1;
|
|
|
|
|
DECL_INITIAL (decl) = init;
|
|
|
|
|
DECL_IN_AGGR_P (decl) = 1;
|
|
|
|
|
|
1999-11-14 21:29:06 +01:00
|
|
|
|
cp_finish_decl (decl, init, asmspec_tree, flags);
|
1999-04-19 14:23:55 +02:00
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Process the specs, declarator (NULL if omitted) and width (NULL if omitted)
|
2000-08-11 16:09:15 +02:00
|
|
|
|
of a structure component, returning a _DECL node.
|
1994-02-24 02:02:37 +01:00
|
|
|
|
QUALS is a list of type qualifiers for this decl (such as for declaring
|
|
|
|
|
const member functions).
|
|
|
|
|
|
|
|
|
|
This is done during the parsing of the struct declaration.
|
2000-08-11 16:09:15 +02:00
|
|
|
|
The _DECL nodes are chained together and the lot of them
|
1994-02-24 02:02:37 +01:00
|
|
|
|
are ultimately passed to `build_struct' to make the RECORD_TYPE node.
|
|
|
|
|
|
|
|
|
|
If class A defines that certain functions in class B are friends, then
|
|
|
|
|
the way I have set things up, it is B who is interested in permission
|
|
|
|
|
granted by A. However, it is in A's context that these declarations
|
|
|
|
|
are parsed. By returning a void_type_node, class A does not attempt
|
|
|
|
|
to incorporate the declarations of the friends within its structure.
|
|
|
|
|
|
|
|
|
|
DO NOT MAKE ANY CHANGES TO THIS CODE WITHOUT MAKING CORRESPONDING
|
|
|
|
|
CHANGES TO CODE IN `start_method'. */
|
|
|
|
|
|
|
|
|
|
tree
|
1996-09-12 21:19:15 +02:00
|
|
|
|
grokfield (declarator, declspecs, init, asmspec_tree, attrlist)
|
|
|
|
|
tree declarator, declspecs, init, asmspec_tree, attrlist;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
c-common.c (decl_attributes): Take a pointer to the node to which attributes are to be attached...
* c-common.c (decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument.
* c-common.h (enum attribute_flags): New.
(decl_attributes): Update prototype.
* c-decl.c (start_decl, push_parm_decl, finish_struct,
finish_enum, start_function): Update calls to decl_attributes.
* c-parse.in (component_declarator, component_notype_declarator,
label): Update calls to decl_attributes.
cp:
* decl2.c (cplus_decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument. Update
call to decl_attributes.
(grokfield): Update call to decl_attributes.
* class.c (finish_struct): Update call to cplus_decl_attributes.
* cp-tree.h (cplus_decl_attributes): Update prototype.
* decl.c (start_decl, grokdeclarator, start_function): Update
calls to decl_attributes and cplus_decl_attributes.
* friend.c (do_friend): Update call to cplus_decl_attributes.
* parse.y (parse_bitfield): Update call to cplus_decl_attributes.
From-SVN: r43995
2001-07-13 22:40:43 +02:00
|
|
|
|
tree value;
|
class.c (count_fields, [...]): Add static prototype.
* class.c (count_fields, add_fields_to_vec): Add static prototype.
* cp-tree.h (opname_tab, assignop_tab, operator_name_string,
get_id_2, composite_pointer_type, dump_node_to_file): Constify a
char*.
* decl.c (named_label_list, cp_finish_decl, grokdeclarator):
Constify a char*.
* decl2.c (finish_static_data_member_decl, grokfield): Constify a
char*.
* dump.c (queue_and_dump_index, dump_int, dump_string,
dump_string_field, dequeue_and_dump, dump_node_to_file): Constify
a char*.
(dump_stmt): Add static prototype.
* errfn.c (cp_thing): Constify a char*.
* error.c (dump_unary_op, dump_binary_op, aggr_variety,
dump_aggr_type, dump_global_iord, dump_decl, dump_function_name,
dump_expr): Constify a char*.
* lex.c (extend_token_buffer_to, pragma_getc, pragma_ungetc,
read_line_number): Add static prototype.
(opname_tab, assignop_tab, operator_name_string): Constify a char*.
(real_yylex): Move label `letter' into the scope where it is used.
* method.c (build_mangled_template_parm_index, build_overload_int,
build_decl_overload_real, get_id_2): Constify a char*.
* search.c (check_final_overrider): Make static.
* typeck.c (composite_pointer_type): Constify a char*.
From-SVN: r28588
1999-08-08 00:28:52 +02:00
|
|
|
|
const char *asmspec = 0;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
int flags = LOOKUP_ONLYCONVERTING;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Convert () initializers to = initializers. */
|
|
|
|
|
if (init == NULL_TREE && declarator != NULL_TREE
|
|
|
|
|
&& TREE_CODE (declarator) == CALL_EXPR
|
|
|
|
|
&& TREE_OPERAND (declarator, 0)
|
|
|
|
|
&& (TREE_CODE (TREE_OPERAND (declarator, 0)) == IDENTIFIER_NODE
|
|
|
|
|
|| TREE_CODE (TREE_OPERAND (declarator, 0)) == SCOPE_REF)
|
1999-08-17 09:20:23 +02:00
|
|
|
|
&& parmlist_is_exprlist (CALL_DECLARATOR_PARMS (declarator)))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
2000-04-18 03:30:21 +02:00
|
|
|
|
/* It's invalid to try to initialize a data member using a
|
|
|
|
|
functional notation, e.g.:
|
|
|
|
|
|
|
|
|
|
struct S {
|
|
|
|
|
static int i (3);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Explain that to the user. */
|
2000-09-06 10:53:45 +02:00
|
|
|
|
static int explained;
|
2000-04-18 03:30:21 +02:00
|
|
|
|
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("invalid data member initialization");
|
2000-09-06 10:53:45 +02:00
|
|
|
|
if (!explained)
|
2000-04-18 03:30:21 +02:00
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("(use `=' to initialize static data members)");
|
2000-09-06 10:53:45 +02:00
|
|
|
|
explained = 1;
|
2000-04-18 03:30:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
declarator = TREE_OPERAND (declarator, 0);
|
1994-12-16 03:07:31 +01:00
|
|
|
|
flags = 0;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-02-20 21:35:10 +01:00
|
|
|
|
if (declspecs == NULL_TREE
|
1996-09-18 19:20:21 +02:00
|
|
|
|
&& TREE_CODE (declarator) == SCOPE_REF
|
|
|
|
|
&& TREE_CODE (TREE_OPERAND (declarator, 1)) == IDENTIFIER_NODE)
|
1996-02-20 21:35:10 +01:00
|
|
|
|
{
|
|
|
|
|
/* Access declaration */
|
1996-02-28 23:01:56 +01:00
|
|
|
|
if (! IS_AGGR_TYPE_CODE (TREE_CODE (TREE_OPERAND (declarator, 0))))
|
|
|
|
|
;
|
|
|
|
|
else if (TREE_COMPLEXITY (declarator) == current_class_depth)
|
1999-04-14 15:20:19 +02:00
|
|
|
|
pop_nested_class ();
|
1996-02-20 21:35:10 +01:00
|
|
|
|
return do_class_using_decl (declarator);
|
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (init
|
|
|
|
|
&& TREE_CODE (init) == TREE_LIST
|
|
|
|
|
&& TREE_VALUE (init) == error_mark_node
|
|
|
|
|
&& TREE_CHAIN (init) == NULL_TREE)
|
1996-02-20 21:35:10 +01:00
|
|
|
|
init = NULL_TREE;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
value = grokdeclarator (declarator, declspecs, FIELD, init != 0, &attrlist);
|
1998-09-05 22:14:21 +02:00
|
|
|
|
if (! value || value == error_mark_node)
|
1998-09-22 13:58:41 +02:00
|
|
|
|
/* friend or constructor went bad. */
|
|
|
|
|
return value;
|
2000-03-16 11:13:28 +01:00
|
|
|
|
if (TREE_TYPE (value) == error_mark_node)
|
|
|
|
|
return error_mark_node;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Pass friendly classes back. */
|
|
|
|
|
if (TREE_CODE (value) == VOID_TYPE)
|
|
|
|
|
return void_type_node;
|
|
|
|
|
|
|
|
|
|
if (DECL_NAME (value) != NULL_TREE
|
|
|
|
|
&& IDENTIFIER_POINTER (DECL_NAME (value))[0] == '_'
|
|
|
|
|
&& ! strcmp (IDENTIFIER_POINTER (DECL_NAME (value)), "_vptr"))
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("member `%D' conflicts with virtual function table field name",
|
cvt.c, [...]: Clean up more old overloading code, old RTTI code, and some formatting quirks.
* cvt.c, decl.c, decl2.c, init.c, rtti.c, typeck.c, typeck2.c,
cp-tree.h: Clean up more old overloading code, old RTTI code, and
some formatting quirks.
From-SVN: r18391
1998-03-03 23:27:04 +01:00
|
|
|
|
value);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Stash away type declarations. */
|
|
|
|
|
if (TREE_CODE (value) == TYPE_DECL)
|
|
|
|
|
{
|
|
|
|
|
DECL_NONLOCAL (value) = 1;
|
1994-05-06 00:19:26 +02:00
|
|
|
|
DECL_CONTEXT (value) = current_class_type;
|
1994-12-30 22:03:40 +01:00
|
|
|
|
|
2000-08-18 11:49:06 +02:00
|
|
|
|
if (CLASS_TYPE_P (TREE_TYPE (value)))
|
|
|
|
|
CLASSTYPE_GOT_SEMICOLON (TREE_TYPE (value)) = 1;
|
|
|
|
|
|
1999-08-14 11:23:49 +02:00
|
|
|
|
if (processing_template_decl)
|
|
|
|
|
value = push_template_decl (value);
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (DECL_IN_AGGR_P (value))
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%D' is already defined in `%T'", value,
|
1998-10-16 14:08:01 +02:00
|
|
|
|
DECL_CONTEXT (value));
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return void_type_node;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (asmspec_tree)
|
|
|
|
|
asmspec = TREE_STRING_POINTER (asmspec_tree);
|
|
|
|
|
|
|
|
|
|
if (init)
|
|
|
|
|
{
|
extend.texi (C++ Signatures): Remove node.
* extend.texi (C++ Signatures): Remove node.
* invoke.texi: Remove discussion of -fhandle-signatures,
signature, sigof, __signature__, and __sigof__.
* Make-lang.in (CXX_SRCS): Remove sig.c.
* Makefile.in (CXX_OBJS): Remove sig.o.
(sig.o): Remove.
* cp-tree.h (CPTI_OPAQUE_TYPE): Remove.
(CPTI_SIGNATURE_TYPE): Likewise.
(CPTI_SIGTABLE_ENTRY_TYPE): Likewise.
(opaque_type_node): Likewise.
(signature_type_node): Likewise.
(sigtable_entry_type): Likewise.
(flag_handle_signatures): Likewise.
(lang_type): Remove is_signature, is_signature_pointer,
is_signature_reference, has_opaque_typedecls,
sigtables_has_been_generated. Adjust dummy. Remove signature,
signature_pointer_to, signature_reference_to.
(IS_SIGNATURE): Remove.
(SET_SIGNATURE): Remove.
(CLEAR_SIGNATURE): Remove.
(IS_SIGNATURE_POINTER): Remove.
(IS_SIGNATURE_REFERENCE): Remove.
(SIGNATURE_HAS_OPAQUE_TYPEDECLS): Remove.
(SIGTABLE_HAS_BEEN_GENERATED): Remove.
(CLASSTYPE_SIGNATURE): Remove.
(SIGNATURE_TYPE): Remove.
(SIGNATURE_METHOD_VEC): Remove.
(SIGNATURE_POINTER_TO): Remove.
(SIGNATURE_REFERENCE_TO): Remove.
(lang_decl_flags): Remove is_default_implementation. Rename
memfunc_pointer_to to saved_tree.
(IS_DEFAULT_IMPLEMENTATION): Remove.
(DECL_MEMFUNC_POINTER_TO): Remove.
(DECL_MEMFUNC_POINTING_TO): Remove.
(DECL_SAVED_TREE): Adjust definition.
(tag_types): Remove signature_type_node.
(SIGNATURE_FIELD_NAME): Remove.
(SIGNATURE_FIELD_NAME_FORMAT): Likewise.
(SIGNATURE_OPTR_NAME): Likewise.
(SIGNATURE_SPTR_NAME): Likewise.
(SIGNATURE_POINTER_NAME): Likewise.
(SIGNATURE_POINTER_NAME_FORMAT): Likewise.
(SIGNATURE_REFERENCE_NAME): Likewise.
(SIGNATURE_REFERNECE_NAME_FORMAT): Likewise.
(SIGTABLE_PTR_TYPE): Likewise.
(SIGTABLE_NAME_FORMAT): Likewise.
(SIGTABLE_NAME_FORMAT_LONG): Likewise.
(SIGTABLE_TAG_NAME): Likewise.
(SIGTABLE_VB_OFF_NAME): Likewise.
(SIGTABLE_VT_OFF_NAME): Likewise.
(finish_base_specifiers): Change prototype.
(build_signature_pointer_type): Remove.
(build_signature_reference_type): Remove.
(build_signature_pointer_constructor): Remove.
(build_signature_method_call): Remove.
(build_optr_ref): Likewise.
(append_signature_fields): Likewise.
(signature_error): Likewise.
* call.c (build_this): Remove signature support.
(build_over_call): Likewise.
(build_new_method_call): Likewise.
* class.c (add_implicitly_declared_members): Likewise.
(finish_struct_1): Likewise.
(finish_struct): Likewise.
* cvt.c (cp_convert_to_pointer): Likewise.
(convert_to_pointer_force): Likewise.
(ocp_convert): Likewise.
* decl.c (sigtable_decl_p): Remove.
(init_decl_processing): Remove support for signatures.
(cp_finish_decl): Likewise.
(grokdeclarator): Likewise.
(grokparms): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
(start_method): Likewise.
* decl2.c (finish_sigtable_vardecl): Remove.
(flag_handle_signatures): Remove.
(lang_f_options): Remove handle-signatures.
(grokfield): Remove support for signatures.
(grokbitfield): Likewise.
(finish_file): Likewise.
(reparse_absdcl_as_casts): Likewise.
* error.c (dump_type_real): Likewise.
(dump_function_decl): Likewise.
* friend.c (make_friend_class): Likewise.
* gxx.gperf: Remove __signature__, signature, __sigof__, sigof.
* hash.h: Regenerated.
* init.c (build_new_1): Remove support for signatures.
* lang-options.h: Remove -fhandle-signatures,
-fno-handle-signatures.
* lex.c (init_parse): Remove support for signatures.
(yyprint): Likewise.
* lex.h (rid): Remove RID_SIGNATURE.
* method.c (build_decl_overload_real): Remove support for
signatures.
(hack_identifier): Likewise.
* parse.y (base_class): Likewise.
(base_class.1): Likewise.
(access_specifier): Likewise.
* search.c (lookup_member): Likewise.
* semantics.c (finish_qualified_object_call_expr): Likewise.
(finish_template_type_parm): Likewise.
(begin_class_definition): Likewise.
(finish_base_specifier): Likewise.
* sig.c: Remove.
* tree.c (build_cplus_method_type): Remove support for signatures.
* typeck.c (require_complete_type): Likewise.
(c_sizeof): Likewise.
(c_alignof): Likewise.
(build_object_ref): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_for_initialization): Likewise.
* typeck2.c (signature_error): Remove.
(store_init_value): Remove support for signatures.
(digest_init): Likewise.
(build_x_arrow): Likewise.
(build_functional_cast): Likewise.
* xref.c (GNU_xref_decl): Likewise.
From-SVN: r28677
1999-08-11 22:22:41 +02:00
|
|
|
|
if (TREE_CODE (value) == FUNCTION_DECL)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
grok_function_init (value, init);
|
|
|
|
|
init = NULL_TREE;
|
|
|
|
|
}
|
1994-07-09 09:13:10 +02:00
|
|
|
|
else if (pedantic && TREE_CODE (value) != VAR_DECL)
|
1994-06-03 23:42:31 +02:00
|
|
|
|
/* Already complained in grokdeclarator. */
|
|
|
|
|
init = NULL_TREE;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
1994-06-03 23:42:31 +02:00
|
|
|
|
/* We allow initializers to become parameters to base
|
|
|
|
|
initializers. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (TREE_CODE (init) == TREE_LIST)
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CHAIN (init) == NULL_TREE)
|
|
|
|
|
init = TREE_VALUE (init);
|
|
|
|
|
else
|
|
|
|
|
init = digest_init (TREE_TYPE (value), init, (tree *)0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (init) == CONST_DECL)
|
|
|
|
|
init = DECL_INITIAL (init);
|
|
|
|
|
else if (TREE_READONLY_DECL_P (init))
|
|
|
|
|
init = decl_constant_value (init);
|
|
|
|
|
else if (TREE_CODE (init) == CONSTRUCTOR)
|
|
|
|
|
init = digest_init (TREE_TYPE (value), init, (tree *)0);
|
|
|
|
|
if (init == error_mark_node)
|
|
|
|
|
/* We must make this look different than `error_mark_node'
|
|
|
|
|
because `decl_const_value' would mis-interpret it
|
|
|
|
|
as only meaning that this VAR_DECL is defined. */
|
|
|
|
|
init = build1 (NOP_EXPR, TREE_TYPE (value), init);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
else if (processing_template_decl)
|
1996-02-28 23:01:56 +01:00
|
|
|
|
;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (! TREE_CONSTANT (init))
|
|
|
|
|
{
|
|
|
|
|
/* We can allow references to things that are effectively
|
|
|
|
|
static, since references are initialized with the address. */
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (value)) != REFERENCE_TYPE
|
|
|
|
|
|| (TREE_STATIC (init) == 0
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
&& (!DECL_P (init) || DECL_EXTERNAL (init) == 0)))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1998-09-07 16:25:35 +02:00
|
|
|
|
error ("field initializer is not constant");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
init = error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (processing_template_decl && ! current_function_decl
|
1996-02-28 23:01:56 +01:00
|
|
|
|
&& (TREE_CODE (value) == VAR_DECL || TREE_CODE (value) == FUNCTION_DECL))
|
1998-02-11 02:22:36 +01:00
|
|
|
|
value = push_template_decl (value);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
1996-01-22 20:49:02 +01:00
|
|
|
|
if (attrlist)
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
cplus_decl_attributes (&value, attrlist, 0);
|
1996-01-22 20:49:02 +01:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (TREE_CODE (value) == VAR_DECL)
|
|
|
|
|
{
|
1999-04-19 14:23:55 +02:00
|
|
|
|
finish_static_data_member_decl (value, init, asmspec_tree,
|
1999-11-14 21:29:06 +01:00
|
|
|
|
flags);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
if (TREE_CODE (value) == FIELD_DECL)
|
|
|
|
|
{
|
|
|
|
|
if (asmspec)
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`asm' specifiers are not permitted on non-static data members");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (DECL_INITIAL (value) == error_mark_node)
|
|
|
|
|
init = error_mark_node;
|
2001-01-08 02:58:54 +01:00
|
|
|
|
cp_finish_decl (value, init, NULL_TREE, flags);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
DECL_INITIAL (value) = init;
|
|
|
|
|
DECL_IN_AGGR_P (value) = 1;
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
if (TREE_CODE (value) == FUNCTION_DECL)
|
|
|
|
|
{
|
1994-12-16 03:07:31 +01:00
|
|
|
|
if (asmspec)
|
|
|
|
|
{
|
|
|
|
|
/* This must override the asm specifier which was placed
|
|
|
|
|
by grokclassfn. Lay this out fresh. */
|
varasm.c (assemble_alias): Use DECL_ASSEMBLER_NAME...
* varasm.c (assemble_alias): Use DECL_ASSEMBLER_NAME, not the
contents of the RTL, to determine the name of the object.
* tree.h (DECL_RTL): Allocate RTL lazily.
(SET_DECL_RTL): New macro.
(DECL_RTL_SET_P): Likewise.
(COPY_DECL_RTL): Likewise.
(DECL_RTL_IF_SET): Likewise.
* varasm.c (make_decl_rtl): Add assertions about the kind of
declaration we are processing.
* c-decl.c (duplicate_decls): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
(start_decl): Likewise.
(finish_decl): Likewise.
* c-semantics.c (emit_local_var): Likewise.
* calls.c (expand_call): Likewise.
* dbxout.c (dbxout_symbol): Likewise.
* emit-rtl.c (unshare_all_rtl): Likewise.
(unshare_all_decls): Likewise.
(reset_used_decls): Likewise.
* expr.c (store_constructor): Likewise.
(safe_from_p): Likewise.
(expand_expr): Likewise.
* function.c (put_var_into_stack): Likewise.
(instantiate_decls_1): Likewise.
(assign_parms): Likewise.
(expand_function_start): Likewise.
(expand_function_end): Likewise.
* ggc-common.c (gcc_mark_trees): Likewise.
* integrate.c (function_cannot_inline_p): Likewise.
(copy_decl_for_inlining): Likewise.
(expand_inline_function): Likewise.
(integrate_parm_decls): Likewise.
(integrate_decl_tree): Likewise.
* print-tree.c (print_node): Likewise.
* reg-stack.c (stack_result): Likewise.
* stmt.c (label_rtx): Likewise.
(expand_return): Likewise.
(expand_decl): Likewise.
(expand_decl_cleanup): Likewise.
(expand_anon_union_decl): Likewise.
* toplev.c (check_global_declarations): Likewise.
(rest_of_decl_compilation): Likewise.
* tree.c (simple_cst_equal): Likewise.
* objc/objc-act.c (generate_static_references): Likewise.
* class.c (build_clone): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
* cp-tree.h (DECL_IN_MEMORY_P): Likewise.
* decl.c (duplicate_decls): Likewise.
(builtin_function): Likewise.
(build_library_fn): Likewise.
(build_cp_library_fn): Likewise.
(check_initializer): Likewise.
(cp_finish_decl): Likewise.
* decl2.c (grokfield): Likewise.
(grok_function_init): Remove #if 0'd code.
(finish_anon_union): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
* friend.c (do_friend): Likewise.
* init.c (get_temp_regvar): Likewise.
* method.c (make_thunk): Likewise.
* pt.c (tsubst_friend_function): Likewise.
(tsubst_decl): Likewise.
(regenerate_decl_from_template): Likewise.
* semantics.c (genrtl_named_return_value): Likewise.
(expand_body): Likewise.
(genrtl_finish_function): Likewise.
* tree.c (cp_tree_equal): Likewise.
* com.c (ffecom_member_phase_2): Use COPY_DECL_RTL,
DECL_RTL_SET_P, etc.
(duplicate_decls): Likewise.
(start_decl): Likewise.
* class.c (build_static_field_ref): Likewise.
(make_method_value): Likewise.
(get_dispatch_table): Likewise.
* decl.c (push_jvm_slot): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
From-SVN: r40482
2001-03-15 03:51:03 +01:00
|
|
|
|
SET_DECL_RTL (value, NULL_RTX);
|
Compute DECL_ASSEMBLER_NAME lazily.
* tree.h (DECL_ASSEMBLER_NAME): Compute it lazily.
(DECL_ASSEMBLER_NAME_SET_P): New macro.
(SET_DECL_ASSEMBLER_NAME): Likewise.
(COPY_DECL_ASSEMBLER_NAME): Likewise.
(set_decl_assembler_name): Declare.
(lang_set_decl_assembler_name): Likewise.
* tree.c (lang_set_decl_assembler_name): New variab.e
(set_decl_assembler_name): New function.
(init_obstacks): Set lang_set_decl_assembler_name.
(build_decl): Don't set DECL_ASSEMBLER_NAME.
* c-decl.c (duplicate_decls): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(builtin_function): Likewise.
(finish_decl): Likewise.
* dbxout.c (dbxout_type_methods): Likewise.
* ggc-common.c (ggc_mark_trees): Likewise.
* profile.c (output_func_start_profiler): Likewise.
* varasm.c (make_decl_rtl): Likewise.
* class.c (get_vtable_decl): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(add_method): Remove optimization involving comparison of
DECL_ASSEMBLER_NAME.
(build_vtbl_or_vbase_field): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(check_methods): Likewise.
(build_clone): Likewise.
(built_vtt): Likewise.
* cp-tree.h (DECL_NEEDED_P): Likewise.
* decl.c (pushtag): Likewise.
(duplicate_decls): Likewise.
(pushdecl): Likewise.
(builtin_function): Likewise.
(build_library_fn_1): Set DECL_LANGUAGE for library functions.
(build_cp_library_fn): Likewise.
(maybe_commonize_var): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(make_rtl_for_nonlocal_decl): Likewise.
(cp_finish_decl): Likewise.
(grokfndecl): Likewise.
(grokvardecl): Likewise.
(grokdeclarator): Likewise.
(start_function): Likewise.
(cp_missing_return_ok_p): Likewise.
* decl2.c (grokclassfn): Likewise.
(check_classfn): Likewise.
(finish_static_data_member_decl): Likewise.
(grokfield): Likewise.
* error.c (GLOBAL_IORD_P): Remove.
(dump_global_iord): Improve output.
(dump_decl): Avoid using DECL_ASSEMBLER_NAME.
* except.c (nothrow_libfn_p): Summarily reject any function not in
namespace-scope.
* init.c (build_java_class_ref): Don't explicitly set
DECL_ASSEMBLER_NAME after calling mangle_decl.
* mangle.c (mangle_decl_string): Handle extern "C" functions.
(mangle_decl): Set the DECL_ASSEMBLER_NAME for the decl.
* method.c (set_mangled_name_for_decl): Don't explicitly set
DECL_ASSEMBLER_NAME after calling mangle_decl.
(make_thunk): Explicitly set the DECL_ASSEMBLER_NAME and
IDENTIFIER_GLOBAL_VALUE for the thunk.
* pt.c (set_mangled_name_for_template_decl): Remove.
(check_explicit_specialization): Don't use it.
(looup_template_class): Don't set DECL_ASSEMBLER_NAME.
(tsubst_friend_function): Likewise.
(tsubst_decl): Likewise.
(regenerate_decl_from_template): Use COPY_DECL_ASSEMBLER_NAME.
* rtti.c (get_tinfo_decl): Use SET_DECL_ASSEMBLER_NAME,
COPY_DECL_ASSEMBLER_NAME, etc. Don't set DECL_ASSEMBLER_NAME
where it's not necessary.
(tinfo_base_init): Likewise.
(create_real_tinfo_var): Likewise.
* search.c (looup_field_1): Likewise.
* semantics.c (finish_named_return_value): Likewise.
* tree.c (init_tree): Set lang_set_decl_assembler_name.
* com.c (builtin_function): Use SET_DECL_ASSEMBLER_NAME.
* class.c (build_class_ref): Use SET_DECL_ASSEMBLER_NAME.
(layout_class): Likewise.
(layout_class_method): Likewise.
(emit_register_classes): Likewise.
* decl.c (builtin_function): Likewise.
(give_name_to_locals): Likewise.
From-SVN: r40642
2001-03-20 00:50:04 +01:00
|
|
|
|
SET_DECL_ASSEMBLER_NAME (value, get_identifier (asmspec));
|
1994-12-16 03:07:31 +01:00
|
|
|
|
}
|
2001-12-09 17:33:44 +01:00
|
|
|
|
if (!DECL_FRIEND_P (value))
|
|
|
|
|
grok_special_member_properties (value);
|
|
|
|
|
|
1999-11-14 21:29:06 +01:00
|
|
|
|
cp_finish_decl (value, init, asmspec_tree, flags);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
/* Pass friends back this way. */
|
|
|
|
|
if (DECL_FRIEND_P (value))
|
|
|
|
|
return void_type_node;
|
|
|
|
|
|
|
|
|
|
DECL_IN_AGGR_P (value) = 1;
|
|
|
|
|
return value;
|
|
|
|
|
}
|
call.c, [...]: Change my_fancy_abort() to abort().
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort().
From-SVN: r49139
2002-01-23 15:26:07 +01:00
|
|
|
|
abort ();
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* NOTREACHED */
|
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like `grokfield', but for bitfields.
|
|
|
|
|
WIDTH is non-NULL for bit fields only, and is an INTEGER_CST node. */
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
grokbitfield (declarator, declspecs, width)
|
|
|
|
|
tree declarator, declspecs, width;
|
|
|
|
|
{
|
1995-10-12 03:33:51 +01:00
|
|
|
|
register tree value = grokdeclarator (declarator, declspecs, BITFIELD,
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
0, NULL);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
if (! value) return NULL_TREE; /* friends went bad. */
|
|
|
|
|
|
|
|
|
|
/* Pass friendly classes back. */
|
|
|
|
|
if (TREE_CODE (value) == VOID_TYPE)
|
|
|
|
|
return void_type_node;
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (value) == TYPE_DECL)
|
|
|
|
|
{
|
2001-12-18 10:36:02 +01:00
|
|
|
|
error ("cannot declare `%D' to be a bit-field type", value);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
/* Usually, finish_struct_1 catches bitfields with invalid types.
|
1998-08-07 18:33:34 +02:00
|
|
|
|
But, in the case of bitfields with function type, we confuse
|
|
|
|
|
ourselves into thinking they are member functions, so we must
|
|
|
|
|
check here. */
|
|
|
|
|
if (TREE_CODE (value) == FUNCTION_DECL)
|
|
|
|
|
{
|
2001-12-18 10:36:02 +01:00
|
|
|
|
error ("cannot declare bit-field `%D' with function type",
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
DECL_NAME (value));
|
1998-08-07 18:33:34 +02:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (DECL_IN_AGGR_P (value))
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%D' is already defined in the class %T", value,
|
1994-02-24 02:02:37 +01:00
|
|
|
|
DECL_CONTEXT (value));
|
|
|
|
|
return void_type_node;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (TREE_STATIC (value))
|
|
|
|
|
{
|
2001-12-18 10:36:02 +01:00
|
|
|
|
error ("static member `%D' cannot be a bit-field", value);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
1999-11-14 21:29:06 +01:00
|
|
|
|
cp_finish_decl (value, NULL_TREE, NULL_TREE, 0);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
if (width != error_mark_node)
|
|
|
|
|
{
|
1996-02-28 23:01:56 +01:00
|
|
|
|
constant_expression_warning (width);
|
|
|
|
|
DECL_INITIAL (value) = width;
|
1998-10-16 05:37:43 +02:00
|
|
|
|
SET_DECL_C_BIT_FIELD (value);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DECL_IN_AGGR_P (value) = 1;
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tree
|
1994-03-24 00:33:53 +01:00
|
|
|
|
grokoptypename (declspecs, declarator)
|
|
|
|
|
tree declspecs, declarator;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
tree t = grokdeclarator (declarator, declspecs, TYPENAME, 0, NULL);
|
2001-02-12 10:58:18 +01:00
|
|
|
|
return mangle_conv_op_name_for_type (t);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* When a function is declared with an initializer,
|
|
|
|
|
do the right thing. Currently, there are two possibilities:
|
|
|
|
|
|
|
|
|
|
class B
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
// initialization possibility #1.
|
|
|
|
|
virtual void f () = 0;
|
|
|
|
|
int g ();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class D1 : B
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
int d1;
|
|
|
|
|
// error, no f ();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class D2 : B
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
int d2;
|
|
|
|
|
void f ();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class D3 : B
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
int d3;
|
|
|
|
|
// initialization possibility #2
|
|
|
|
|
void f () = B::f;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
grok_function_init (decl, init)
|
|
|
|
|
tree decl;
|
|
|
|
|
tree init;
|
|
|
|
|
{
|
|
|
|
|
/* An initializer for a function tells how this function should
|
|
|
|
|
be inherited. */
|
|
|
|
|
tree type = TREE_TYPE (decl);
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (type) == FUNCTION_TYPE)
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("initializer specified for non-member function `%D'", decl);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else if (integer_zerop (init))
|
2001-12-09 17:33:44 +01:00
|
|
|
|
DECL_PURE_VIRTUAL_P (decl) = 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("invalid initializer for virtual method `%D'", decl);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1995-03-23 01:44:31 +01:00
|
|
|
|
void
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
cplus_decl_attributes (decl, attributes, flags)
|
|
|
|
|
tree *decl, attributes;
|
c-common.c (decl_attributes): Take a pointer to the node to which attributes are to be attached...
* c-common.c (decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument.
* c-common.h (enum attribute_flags): New.
(decl_attributes): Update prototype.
* c-decl.c (start_decl, push_parm_decl, finish_struct,
finish_enum, start_function): Update calls to decl_attributes.
* c-parse.in (component_declarator, component_notype_declarator,
label): Update calls to decl_attributes.
cp:
* decl2.c (cplus_decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument. Update
call to decl_attributes.
(grokfield): Update call to decl_attributes.
* class.c (finish_struct): Update call to cplus_decl_attributes.
* cp-tree.h (cplus_decl_attributes): Update prototype.
* decl.c (start_decl, grokdeclarator, start_function): Update
calls to decl_attributes and cplus_decl_attributes.
* friend.c (do_friend): Update call to cplus_decl_attributes.
* parse.y (parse_bitfield): Update call to cplus_decl_attributes.
From-SVN: r43995
2001-07-13 22:40:43 +02:00
|
|
|
|
int flags;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
c-common.c (decl_attributes): Take a pointer to the node to which attributes are to be attached...
* c-common.c (decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument.
* c-common.h (enum attribute_flags): New.
(decl_attributes): Update prototype.
* c-decl.c (start_decl, push_parm_decl, finish_struct,
finish_enum, start_function): Update calls to decl_attributes.
* c-parse.in (component_declarator, component_notype_declarator,
label): Update calls to decl_attributes.
cp:
* decl2.c (cplus_decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument. Update
call to decl_attributes.
(grokfield): Update call to decl_attributes.
* class.c (finish_struct): Update call to cplus_decl_attributes.
* cp-tree.h (cplus_decl_attributes): Update prototype.
* decl.c (start_decl, grokdeclarator, start_function): Update
calls to decl_attributes and cplus_decl_attributes.
* friend.c (do_friend): Update call to cplus_decl_attributes.
* parse.y (parse_bitfield): Update call to cplus_decl_attributes.
From-SVN: r43995
2001-07-13 22:40:43 +02:00
|
|
|
|
if (*decl == NULL_TREE || *decl == void_type_node)
|
1995-04-24 19:27:46 +02:00
|
|
|
|
return;
|
|
|
|
|
|
c-common.c (decl_attributes): Take a pointer to the node to which attributes are to be attached...
* c-common.c (decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument.
* c-common.h (enum attribute_flags): New.
(decl_attributes): Update prototype.
* c-decl.c (start_decl, push_parm_decl, finish_struct,
finish_enum, start_function): Update calls to decl_attributes.
* c-parse.in (component_declarator, component_notype_declarator,
label): Update calls to decl_attributes.
cp:
* decl2.c (cplus_decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument. Update
call to decl_attributes.
(grokfield): Update call to decl_attributes.
* class.c (finish_struct): Update call to cplus_decl_attributes.
* cp-tree.h (cplus_decl_attributes): Update prototype.
* decl.c (start_decl, grokdeclarator, start_function): Update
calls to decl_attributes and cplus_decl_attributes.
* friend.c (do_friend): Update call to cplus_decl_attributes.
* parse.y (parse_bitfield): Update call to cplus_decl_attributes.
From-SVN: r43995
2001-07-13 22:40:43 +02:00
|
|
|
|
if (TREE_CODE (*decl) == TEMPLATE_DECL)
|
|
|
|
|
decl = &DECL_TEMPLATE_RESULT (*decl);
|
1995-04-24 19:27:46 +02:00
|
|
|
|
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
decl_attributes (decl, attributes, flags);
|
1995-05-10 04:58:06 +02:00
|
|
|
|
|
c-common.c (decl_attributes): Take a pointer to the node to which attributes are to be attached...
* c-common.c (decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument.
* c-common.h (enum attribute_flags): New.
(decl_attributes): Update prototype.
* c-decl.c (start_decl, push_parm_decl, finish_struct,
finish_enum, start_function): Update calls to decl_attributes.
* c-parse.in (component_declarator, component_notype_declarator,
label): Update calls to decl_attributes.
cp:
* decl2.c (cplus_decl_attributes): Take a pointer to the node to
which attributes are to be attached, and a flags argument. Update
call to decl_attributes.
(grokfield): Update call to decl_attributes.
* class.c (finish_struct): Update call to cplus_decl_attributes.
* cp-tree.h (cplus_decl_attributes): Update prototype.
* decl.c (start_decl, grokdeclarator, start_function): Update
calls to decl_attributes and cplus_decl_attributes.
* friend.c (do_friend): Update call to cplus_decl_attributes.
* parse.y (parse_bitfield): Update call to cplus_decl_attributes.
From-SVN: r43995
2001-07-13 22:40:43 +02:00
|
|
|
|
if (TREE_CODE (*decl) == TYPE_DECL)
|
|
|
|
|
SET_IDENTIFIER_TYPE_VALUE (DECL_NAME (*decl), TREE_TYPE (*decl));
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* CONSTRUCTOR_NAME:
|
|
|
|
|
Return the name for the constructor (or destructor) for the
|
|
|
|
|
specified class. Argument can be RECORD_TYPE, TYPE_DECL, or
|
|
|
|
|
IDENTIFIER_NODE. When given a template, this routine doesn't
|
|
|
|
|
lose the specialization. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
tree
|
|
|
|
|
constructor_name_full (thing)
|
|
|
|
|
tree thing;
|
|
|
|
|
{
|
pt.c (coerce_template_parms): Don't access elements of ARGLIST that is not really present.
Wed Jan 21 10:29:57 1998 Kriang Lerdsuwanakij <lerdsuwa@scf.usc.edu>
* pt.c (coerce_template_parms): Don't access elements of ARGLIST
that is not really present. Substitute default arguments in
template template arguments. Correctly convert TEMPLATE_DECL to
TEMPLATE_TEMPLATE_PARM.
(comp_template_args): TEMPLATE_DECL and TEMPLATE_TEMPLATE_PARM
are no longer treated specially here.
* parse.y (template_template_parm): Fix copy error.
* decl.c (grokdeclarator): Warn about missing `typename' for nested
type created from template template parameters.
* parse.y (bad_parm): Likewise
* class.c (finish_struct): Handle TEMPLATE_TEMPLATE_PARM.
(push_nested_class): Likewise.
* cp-tree.def (TEMPLATE_TEMPLATE_PARM): New tree code.
* cp-tree.h (DECL_TEMPLATE_TEMPLATE_PARM_P): New macro.
(copy_template_template_parm): Declare.
* decl.c (arg_looking_for_template): New variable.
(lookup_name_real): Handle TEMPLATE_TEMPLATE_PARM.
Try to return TEMPLATE_DECL or TEMPLATE_TEMPLATE_PARM
node if arg_looking_for_template is nonzero.
(pushdecl): Handle TEMPLATE_TEMPLATE_PARM.
(grok_op_properties, xref_tag, xref_basetypes): Likewise.
(grokdeclarator): Handle TEMPLATE_DECL.
* decl2.c (constructor_name_full): Handle TEMPLATE_TEMPLATE_PARM.
* error.c (dump_type): Add TEMPLATE_DECL and TEMPLATE_TEMPLATE_PARM.
(dump_type_prefix, dump_type_suffix) Handle TEMPLATE_TEMPLATE_PARM.
(dump_decl): Handle unnamed template type parameters.
Handle template template parameters.
(dump_function_name): Handle template template parameters.
* init.c (is_aggr_typedef, is_aggr_type, get_aggr_from_typedef):
Handle TEMPLATE_TEMPLATE_PARM.
* method.c (build_template_template_parm_names): New function.
(build_template_parm_names): Handle TEMPLATE_DECL.
(build_overload_nested_name, build_overload_name):
Handle TEMPLATE_TEMPLATE_PARM.
* parse.y (maybe_identifier): New nonterminal.
(template_type_parm): Use it.
(template_template_parm, template_arg1): New nonterminal.
(template_parm): Add template_template_parm rules.
(template_arg): Set processing_template_arg.
(template_arg1): Rules moved from template_arg.
(primary, nonnested_type): Set arg_looking_for_template if we are
processing template arguments.
* pt.c (begin_member_template_processing): Handle TEMPLATE_DECL.
(process_template_parm): Handle template template parameters.
(coerce_template_parms, comp_template_args): Likewise.
(mangle_class_name_for_template, lookup_template_class): Likewise.
(uses_template_parms): Handle TEMPLATE_DECL and
TEMPLATE_TEMPLATE_PARM.
(current_template_args): Handle TEMPLATE_DECL.
(tsubst, tsubst_copy, unify): Handle TEMPLATE_TEMPLATE_PARM.
* search.c (dfs_walk, dfs_record_inheritance):
Handle TEMPLATE_TEMPLATE_PARM.
* tree.c (copy_template_template_parm): New function.
(mapcar): Handle TEMPLATE_TEMPLATE_PARM.
* typeck.c (comptypes): Handle TEMPLATE_TEMPLATE_PARM.
From-SVN: r17441
1998-01-22 12:03:56 +01:00
|
|
|
|
if (TREE_CODE (thing) == TEMPLATE_TYPE_PARM
|
2000-09-05 03:01:39 +02:00
|
|
|
|
|| TREE_CODE (thing) == BOUND_TEMPLATE_TEMPLATE_PARM
|
1998-03-25 03:05:53 +01:00
|
|
|
|
|| TREE_CODE (thing) == TYPENAME_TYPE)
|
1996-01-17 19:57:55 +01:00
|
|
|
|
thing = TYPE_NAME (thing);
|
|
|
|
|
else if (IS_AGGR_TYPE_CODE (TREE_CODE (thing)))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
if (TYPE_WAS_ANONYMOUS (thing) && TYPE_HAS_CONSTRUCTOR (thing))
|
1998-05-11 00:53:45 +02:00
|
|
|
|
thing = DECL_NAME (OVL_CURRENT (TREE_VEC_ELT (CLASSTYPE_METHOD_VEC (thing), 0)));
|
1994-02-24 02:02:37 +01:00
|
|
|
|
else
|
|
|
|
|
thing = TYPE_NAME (thing);
|
|
|
|
|
}
|
|
|
|
|
if (TREE_CODE (thing) == TYPE_DECL
|
|
|
|
|
|| (TREE_CODE (thing) == TEMPLATE_DECL
|
1996-02-28 23:01:56 +01:00
|
|
|
|
&& TREE_CODE (DECL_TEMPLATE_RESULT (thing)) == TYPE_DECL))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
thing = DECL_NAME (thing);
|
|
|
|
|
my_friendly_assert (TREE_CODE (thing) == IDENTIFIER_NODE, 197);
|
|
|
|
|
return thing;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* CONSTRUCTOR_NAME:
|
|
|
|
|
Return the name for the constructor (or destructor) for the
|
|
|
|
|
specified class. Argument can be RECORD_TYPE, TYPE_DECL, or
|
|
|
|
|
IDENTIFIER_NODE. When given a template, return the plain
|
|
|
|
|
unspecialized name. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
tree
|
|
|
|
|
constructor_name (thing)
|
|
|
|
|
tree thing;
|
|
|
|
|
{
|
|
|
|
|
tree t;
|
|
|
|
|
thing = constructor_name_full (thing);
|
|
|
|
|
t = IDENTIFIER_TEMPLATE (thing);
|
|
|
|
|
if (!t)
|
|
|
|
|
return thing;
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return t;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
2002-07-10 01:31:28 +02:00
|
|
|
|
|
|
|
|
|
/* Returns TRUE if NAME is the name for the constructor for TYPE. */
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
constructor_name_p (tree name, tree type)
|
|
|
|
|
{
|
|
|
|
|
return (name == constructor_name (type)
|
|
|
|
|
|| name == constructor_name_full (type));
|
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
2000-04-06 18:30:45 +02:00
|
|
|
|
/* Defer the compilation of the FN until the end of compilation. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
void
|
2000-04-06 18:30:45 +02:00
|
|
|
|
defer_fn (fn)
|
|
|
|
|
tree fn;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
2000-04-06 18:30:45 +02:00
|
|
|
|
if (DECL_DEFERRED_FN (fn))
|
1994-04-08 08:08:43 +02:00
|
|
|
|
return;
|
2000-04-06 18:30:45 +02:00
|
|
|
|
DECL_DEFERRED_FN (fn) = 1;
|
|
|
|
|
if (!deferred_fns)
|
|
|
|
|
VARRAY_TREE_INIT (deferred_fns, 32, "deferred_fns");
|
1999-12-05 01:37:56 +01:00
|
|
|
|
|
2000-04-06 18:30:45 +02:00
|
|
|
|
VARRAY_PUSH_TREE (deferred_fns, fn);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-21 02:48:49 +02:00
|
|
|
|
/* Hunts through the global anonymous union ANON_DECL, building
|
|
|
|
|
appropriate VAR_DECLs. Stores cleanups on the list of ELEMS, and
|
|
|
|
|
returns a VAR_DECL whose size is the same as the size of the
|
2001-08-09 19:52:35 +02:00
|
|
|
|
ANON_DECL, if one is available.
|
|
|
|
|
|
|
|
|
|
FIXME: we should really handle anonymous unions by binding the names
|
|
|
|
|
of the members to COMPONENT_REFs rather than this kludge. */
|
1998-05-20 13:03:18 +02:00
|
|
|
|
|
1999-03-03 12:24:45 +01:00
|
|
|
|
static tree
|
1998-05-21 02:48:49 +02:00
|
|
|
|
build_anon_union_vars (anon_decl, elems, static_p, external_p)
|
1998-05-20 13:03:18 +02:00
|
|
|
|
tree anon_decl;
|
1998-05-21 02:48:49 +02:00
|
|
|
|
tree* elems;
|
|
|
|
|
int static_p;
|
|
|
|
|
int external_p;
|
1998-05-20 13:03:18 +02:00
|
|
|
|
{
|
1998-05-21 02:48:49 +02:00
|
|
|
|
tree type = TREE_TYPE (anon_decl);
|
1998-05-20 13:03:18 +02:00
|
|
|
|
tree main_decl = NULL_TREE;
|
1998-05-21 02:48:49 +02:00
|
|
|
|
tree field;
|
1998-05-20 13:03:18 +02:00
|
|
|
|
|
1999-05-19 12:44:22 +02:00
|
|
|
|
/* Rather than write the code to handle the non-union case,
|
|
|
|
|
just give an error. */
|
|
|
|
|
if (TREE_CODE (type) != UNION_TYPE)
|
|
|
|
|
error ("anonymous struct not inside named type");
|
|
|
|
|
|
1998-05-21 02:48:49 +02:00
|
|
|
|
for (field = TYPE_FIELDS (type);
|
1998-05-20 13:03:18 +02:00
|
|
|
|
field != NULL_TREE;
|
|
|
|
|
field = TREE_CHAIN (field))
|
|
|
|
|
{
|
1998-05-21 02:48:49 +02:00
|
|
|
|
tree decl;
|
1998-11-18 03:21:54 +01:00
|
|
|
|
|
|
|
|
|
if (DECL_ARTIFICIAL (field))
|
1998-05-20 13:03:18 +02:00
|
|
|
|
continue;
|
1998-11-18 03:21:54 +01:00
|
|
|
|
if (TREE_CODE (field) != FIELD_DECL)
|
|
|
|
|
{
|
|
|
|
|
cp_pedwarn_at ("`%#D' invalid; an anonymous union can only have non-static data members",
|
|
|
|
|
field);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
1998-05-20 13:03:18 +02:00
|
|
|
|
|
1998-05-21 02:48:49 +02:00
|
|
|
|
if (TREE_PRIVATE (field))
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_pedwarn_at ("private member `%#D' in anonymous union", field);
|
1998-05-21 02:48:49 +02:00
|
|
|
|
else if (TREE_PROTECTED (field))
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_pedwarn_at ("protected member `%#D' in anonymous union", field);
|
1998-05-21 02:48:49 +02:00
|
|
|
|
|
|
|
|
|
if (DECL_NAME (field) == NULL_TREE
|
1999-05-19 12:44:22 +02:00
|
|
|
|
&& ANON_AGGR_TYPE_P (TREE_TYPE (field)))
|
1998-05-25 12:28:16 +02:00
|
|
|
|
{
|
|
|
|
|
decl = build_anon_union_vars (field, elems, static_p, external_p);
|
|
|
|
|
if (!decl)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
1998-09-25 23:34:50 +02:00
|
|
|
|
else if (DECL_NAME (field) == NULL_TREE)
|
|
|
|
|
continue;
|
1998-05-21 02:48:49 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
decl = build_decl (VAR_DECL, DECL_NAME (field), TREE_TYPE (field));
|
|
|
|
|
/* tell `pushdecl' that this is not tentative. */
|
|
|
|
|
DECL_INITIAL (decl) = error_mark_node;
|
|
|
|
|
TREE_PUBLIC (decl) = 0;
|
|
|
|
|
TREE_STATIC (decl) = static_p;
|
|
|
|
|
DECL_EXTERNAL (decl) = external_p;
|
|
|
|
|
decl = pushdecl (decl);
|
|
|
|
|
DECL_INITIAL (decl) = NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
2000-08-09 07:52:17 +02:00
|
|
|
|
/* Only write out one anon union element--choose the largest
|
|
|
|
|
one. We used to try to find one the same size as the union,
|
|
|
|
|
but that fails if the ABI forces us to align the union more
|
|
|
|
|
strictly. */
|
1998-05-20 13:03:18 +02:00
|
|
|
|
if (main_decl == NULL_TREE
|
2000-08-09 07:52:17 +02:00
|
|
|
|
|| tree_int_cst_lt (DECL_SIZE (main_decl), DECL_SIZE (decl)))
|
|
|
|
|
{
|
|
|
|
|
if (main_decl)
|
|
|
|
|
TREE_ASM_WRITTEN (main_decl) = 1;
|
|
|
|
|
main_decl = decl;
|
|
|
|
|
}
|
1998-05-21 02:48:49 +02:00
|
|
|
|
else
|
1998-05-20 13:03:18 +02:00
|
|
|
|
/* ??? This causes there to be no debug info written out
|
|
|
|
|
about this decl. */
|
1998-05-21 02:48:49 +02:00
|
|
|
|
TREE_ASM_WRITTEN (decl) = 1;
|
|
|
|
|
|
|
|
|
|
if (DECL_NAME (field) == NULL_TREE
|
1999-05-19 12:44:22 +02:00
|
|
|
|
&& ANON_AGGR_TYPE_P (TREE_TYPE (field)))
|
1998-05-21 02:48:49 +02:00
|
|
|
|
/* The remainder of the processing was already done in the
|
|
|
|
|
recursive call. */
|
|
|
|
|
continue;
|
1998-05-20 13:03:18 +02:00
|
|
|
|
|
1998-05-21 02:48:49 +02:00
|
|
|
|
/* If there's a cleanup to do, it belongs in the
|
|
|
|
|
TREE_PURPOSE of the following TREE_LIST. */
|
1999-09-09 08:17:13 +02:00
|
|
|
|
*elems = tree_cons (NULL_TREE, decl, *elems);
|
1998-05-21 02:48:49 +02:00
|
|
|
|
TREE_TYPE (*elems) = type;
|
|
|
|
|
}
|
|
|
|
|
|
1998-05-20 13:03:18 +02:00
|
|
|
|
return main_decl;
|
|
|
|
|
}
|
|
|
|
|
|
2001-04-10 17:48:11 +02:00
|
|
|
|
/* Finish off the processing of a UNION_TYPE structure. If the union is an
|
|
|
|
|
anonymous union, then all members must be laid out together. PUBLIC_P
|
|
|
|
|
is nonzero if this union is not declared static. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
void
|
|
|
|
|
finish_anon_union (anon_union_decl)
|
|
|
|
|
tree anon_union_decl;
|
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (anon_union_decl);
|
1998-05-21 02:48:49 +02:00
|
|
|
|
tree main_decl;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
int public_p = TREE_PUBLIC (anon_union_decl);
|
|
|
|
|
int static_p = TREE_STATIC (anon_union_decl);
|
|
|
|
|
int external_p = DECL_EXTERNAL (anon_union_decl);
|
|
|
|
|
|
2001-06-01 13:57:35 +02:00
|
|
|
|
/* The VAR_DECL's context is the same as the TYPE's context. */
|
|
|
|
|
DECL_CONTEXT (anon_union_decl) = DECL_CONTEXT (TYPE_NAME (type));
|
|
|
|
|
|
1998-05-21 02:48:49 +02:00
|
|
|
|
if (TYPE_FIELDS (type) == NULL_TREE)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (public_p)
|
|
|
|
|
{
|
2000-05-17 20:46:32 +02:00
|
|
|
|
error ("namespace-scope anonymous aggregates must be static");
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-09-24 03:17:29 +02:00
|
|
|
|
main_decl = build_anon_union_vars (anon_union_decl,
|
|
|
|
|
&DECL_ANON_UNION_ELEMS (anon_union_decl),
|
1998-05-21 02:48:49 +02:00
|
|
|
|
static_p, external_p);
|
1998-05-20 13:03:18 +02:00
|
|
|
|
|
1998-09-25 23:34:50 +02:00
|
|
|
|
if (main_decl == NULL_TREE)
|
|
|
|
|
{
|
2000-05-17 20:46:32 +02:00
|
|
|
|
warning ("anonymous aggregate with no members");
|
1998-09-25 23:34:50 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (static_p)
|
|
|
|
|
{
|
2001-01-11 00:06:30 +01:00
|
|
|
|
make_decl_rtl (main_decl, 0);
|
varasm.c (assemble_alias): Use DECL_ASSEMBLER_NAME...
* varasm.c (assemble_alias): Use DECL_ASSEMBLER_NAME, not the
contents of the RTL, to determine the name of the object.
* tree.h (DECL_RTL): Allocate RTL lazily.
(SET_DECL_RTL): New macro.
(DECL_RTL_SET_P): Likewise.
(COPY_DECL_RTL): Likewise.
(DECL_RTL_IF_SET): Likewise.
* varasm.c (make_decl_rtl): Add assertions about the kind of
declaration we are processing.
* c-decl.c (duplicate_decls): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
(start_decl): Likewise.
(finish_decl): Likewise.
* c-semantics.c (emit_local_var): Likewise.
* calls.c (expand_call): Likewise.
* dbxout.c (dbxout_symbol): Likewise.
* emit-rtl.c (unshare_all_rtl): Likewise.
(unshare_all_decls): Likewise.
(reset_used_decls): Likewise.
* expr.c (store_constructor): Likewise.
(safe_from_p): Likewise.
(expand_expr): Likewise.
* function.c (put_var_into_stack): Likewise.
(instantiate_decls_1): Likewise.
(assign_parms): Likewise.
(expand_function_start): Likewise.
(expand_function_end): Likewise.
* ggc-common.c (gcc_mark_trees): Likewise.
* integrate.c (function_cannot_inline_p): Likewise.
(copy_decl_for_inlining): Likewise.
(expand_inline_function): Likewise.
(integrate_parm_decls): Likewise.
(integrate_decl_tree): Likewise.
* print-tree.c (print_node): Likewise.
* reg-stack.c (stack_result): Likewise.
* stmt.c (label_rtx): Likewise.
(expand_return): Likewise.
(expand_decl): Likewise.
(expand_decl_cleanup): Likewise.
(expand_anon_union_decl): Likewise.
* toplev.c (check_global_declarations): Likewise.
(rest_of_decl_compilation): Likewise.
* tree.c (simple_cst_equal): Likewise.
* objc/objc-act.c (generate_static_references): Likewise.
* class.c (build_clone): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
* cp-tree.h (DECL_IN_MEMORY_P): Likewise.
* decl.c (duplicate_decls): Likewise.
(builtin_function): Likewise.
(build_library_fn): Likewise.
(build_cp_library_fn): Likewise.
(check_initializer): Likewise.
(cp_finish_decl): Likewise.
* decl2.c (grokfield): Likewise.
(grok_function_init): Remove #if 0'd code.
(finish_anon_union): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
* friend.c (do_friend): Likewise.
* init.c (get_temp_regvar): Likewise.
* method.c (make_thunk): Likewise.
* pt.c (tsubst_friend_function): Likewise.
(tsubst_decl): Likewise.
(regenerate_decl_from_template): Likewise.
* semantics.c (genrtl_named_return_value): Likewise.
(expand_body): Likewise.
(genrtl_finish_function): Likewise.
* tree.c (cp_tree_equal): Likewise.
* com.c (ffecom_member_phase_2): Use COPY_DECL_RTL,
DECL_RTL_SET_P, etc.
(duplicate_decls): Likewise.
(start_decl): Likewise.
* class.c (build_static_field_ref): Likewise.
(make_method_value): Likewise.
(get_dispatch_table): Likewise.
* decl.c (push_jvm_slot): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc.
From-SVN: r40482
2001-03-15 03:51:03 +01:00
|
|
|
|
COPY_DECL_RTL (main_decl, anon_union_decl);
|
1999-09-24 03:17:29 +02:00
|
|
|
|
expand_anon_union_decl (anon_union_decl,
|
|
|
|
|
NULL_TREE,
|
|
|
|
|
DECL_ANON_UNION_ELEMS (anon_union_decl));
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
1999-09-24 03:17:29 +02:00
|
|
|
|
else
|
|
|
|
|
add_decl_stmt (anon_union_decl);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Finish processing a builtin type TYPE. It's name is NAME,
|
|
|
|
|
its fields are in the array FIELDS. LEN is the number of elements
|
|
|
|
|
in FIELDS minus one, or put another way, it is the maximum subscript
|
|
|
|
|
used in FIELDS.
|
|
|
|
|
|
|
|
|
|
It is given the same alignment as ALIGN_TYPE. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
void
|
|
|
|
|
finish_builtin_type (type, name, fields, len, align_type)
|
|
|
|
|
tree type;
|
Warning fixes:
* call.c (op_error): Const-ify a char*.
(add_candidate, source_type, add_warning): Add static prototype.
(print_z_candidates): Const-ify a char*.
* class.c (resolve_address_of_overloaded_function,
fixed_type_or_null, build_vtable_entry_ref): Add static prototype.
(get_vtable_name, finish_struct_1): Const-ify a char*.
* cvt.c (convert_to_reference): Likewise.
* decl.c (redeclaration_error_message, record_builtin_type,
record_unknown_type, member_function_or_else, bad_specifiers):
Likewise.
(find_binding, select_decl, unqualified_namespace_lookup,
lookup_flags, qualify_lookup, record_builtin_java_type, tag_name):
Add static prototype.
(warn_extern_redeclared_static, duplicate_decls, pushdecl,
implicitly_declare, record_builtin_java_type, define_function,
grok_op_properties, tag_name): Const-ify a char*.
* cp-tree.h (FORMAT_VBASE_NAME): Allow parameter `BUF' to be const.
(define_function, finish_builtin_type): Const-ify a char*.
(cp_error, cp_error_at, cp_warning, cp_warning_at, cp_pedwarn,
cp_pedwarn_at, cp_compiler_error, cp_sprintf): Add prototype args.
(file_name_nondirectory): Const-ify a char*.
(init_filename_times): Don't prototype.
(compiler_error): Prototype.
(yyerror, init_repo): Const-ify a char*.
(build_srcloc): Don't prototype.
(build_x_indirect_ref, build_indirect_ref, build_component_addr):
Const-ify a char*.
(warn_for_assignment): Don't prototype.
(convert_for_initialization, readonly_error, check_for_new_type,
GNU_xref_begin, GNU_xref_file, GNU_xref_ref, GNU_xref_call):
Const-ify a char*.
* decl2.c (acceptable_java_type, output_vtable_inherit,
setup_initp, start_objects, finish_objects, do_dtors, do_ctors,
merge_functions, decl_namespace, validate_nonmember_using_decl,
do_nonmember_using_decl): Add static prototype.
(lang_f_options): Const-ify a char*.
(finish_builtin_type): Likewise.
(add_function, arg_assoc_namespace, arg_assoc_class): Add static
prototype.
* errfn.c: Include cp-tree.h.
(cp_thing): Add static prototype.
(compiler_error): Don't protoptype.
(cp_compiler_error): Cast `compiler_error' to `errorfn' before
passing it to `cp_thing'.
* error.c (interesting_scope_p): Add static prototype.
* except.c (build_eh_type_type, build_eh_type_type_ref): Const-ify
a char*.
* init.c (compiler_error): Don't prototype.
(member_init_ok_or_else): Const-ify a char*.
(build_java_class_ref): Add static prototype.
* lex.c (compiler_error): Don't prototype.
(get_time_identifier, interface_strcmp, extend_token_buffer,
handle_cp_pragma): Const-ify a char*.
(is_global, init_filename_times): Add static prototype.
(file_name_nondirectory, cplus_tree_code_name): Const-ify a char*.
(compiler_error): Change from fixed args to variable args.
(yyerror): Const-ify a char*.
* parse.y (cond_stmt_keyword): Const-ify a char*.
(parse_decl): Add static prototype.
* pt.c (template_args_equal, print_template_context): Likewise.
(print_candidates, check_default_tmpl_args): Const-ify a char*.
(instantiate_class_template): Likewise.
* repo.c (get_base_filename, open_repo_file, init_repo): Likewise.
* rtti.c (call_void_fn, expand_generic_desc, expand_si_desc,
expand_class_desc, expand_ptr_desc, expand_attr_desc): Likewise.
* search.c (lookup_field_info, lookup_member): Likewise.
(lookup_member): Cast the first argument of `bzero' to a PTR.
* sig.c (compiler_error): Don't prototype.
(build_signature_pointer_or_reference_nam): Const-ify a char*.
(get_sigtable_name, build_member_function_pointer): Likewise.
* tree.c (compiler_error): Don't prototype.
(no_linkage_helper, build_srcloc): Add static prototype.
(build_vbase_pointer_fields): Const-ify a char*.
(__eprintf): Don't unnecessarily handle `const' when !__STDC__.
* typeck.c (compiler_error): Don't prototype.
(convert_for_assignment): Const-ify a char*.
(comp_cv_target_types): Add static prototype.
(build_x_indirect_ref, build_indirect_ref, convert_arguments,
build_component_addr, build_unary_op, convert_for_initialization):
Const-ify a char*.
* typeck2.c (ack): Add static prototype and change from fixed args
to variable args.
(readonly_error, check_for_new_type): Const-ify a char*.
* xref.c (_XREF_FILE, find_file, filename, fctname, declname,
fixname, open_xref_file, classname, GNU_xref_begin): Likewise.
(GNU_xref_file): Likewise. Also use `xmalloc' instead of `malloc'.
(GNU_xref_end_scope, GNU_xref_ref, GNU_xref_decl, GNU_xref_call,
gen_assign, GNU_xref_member): Const-ify a char*.
From-SVN: r25994
1999-03-26 08:45:00 +01:00
|
|
|
|
const char *name;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
tree fields[];
|
|
|
|
|
int len;
|
|
|
|
|
tree align_type;
|
|
|
|
|
{
|
|
|
|
|
register int i;
|
|
|
|
|
|
|
|
|
|
TYPE_FIELDS (type) = fields[0];
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
{
|
|
|
|
|
layout_type (TREE_TYPE (fields[i]));
|
|
|
|
|
DECL_FIELD_CONTEXT (fields[i]) = type;
|
|
|
|
|
TREE_CHAIN (fields[i]) = fields[i+1];
|
|
|
|
|
}
|
|
|
|
|
DECL_FIELD_CONTEXT (fields[i]) = type;
|
|
|
|
|
TYPE_ALIGN (type) = TYPE_ALIGN (align_type);
|
2000-06-14 07:30:09 +02:00
|
|
|
|
TYPE_USER_ALIGN (type) = TYPE_USER_ALIGN (align_type);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
layout_type (type);
|
|
|
|
|
#if 0 /* not yet, should get fixed properly later */
|
|
|
|
|
TYPE_NAME (type) = make_type_decl (get_identifier (name), type);
|
|
|
|
|
#else
|
|
|
|
|
TYPE_NAME (type) = build_decl (TYPE_DECL, get_identifier (name), type);
|
|
|
|
|
#endif
|
1996-12-18 03:46:25 +01:00
|
|
|
|
TYPE_STUB_DECL (type) = TYPE_NAME (type);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
layout_decl (TYPE_NAME (type), 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Auxiliary functions to make type signatures for
|
|
|
|
|
`operator new' and `operator delete' correspond to
|
|
|
|
|
what compiler will be expecting. */
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
coerce_new_type (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
2000-11-08 15:03:32 +01:00
|
|
|
|
int e = 0;
|
|
|
|
|
tree args = TYPE_ARG_TYPES (type);
|
|
|
|
|
|
|
|
|
|
my_friendly_assert (TREE_CODE (type) == FUNCTION_TYPE, 20001107);
|
|
|
|
|
|
|
|
|
|
if (!same_type_p (TREE_TYPE (type), ptr_type_node))
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
e = 1, error ("`operator new' must return type `%T'", ptr_type_node);
|
2000-11-08 15:03:32 +01:00
|
|
|
|
|
|
|
|
|
if (!args || args == void_list_node
|
|
|
|
|
|| !same_type_p (TREE_VALUE (args), c_size_type_node))
|
|
|
|
|
{
|
|
|
|
|
e = 2;
|
|
|
|
|
if (args && args != void_list_node)
|
|
|
|
|
args = TREE_CHAIN (args);
|
2002-01-07 21:52:32 +01:00
|
|
|
|
pedwarn ("`operator new' takes type `size_t' (`%T') as first parameter", c_size_type_node);
|
2000-11-08 15:03:32 +01:00
|
|
|
|
}
|
|
|
|
|
switch (e)
|
|
|
|
|
{
|
|
|
|
|
case 2:
|
|
|
|
|
args = tree_cons (NULL_TREE, c_size_type_node, args);
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
case 1:
|
|
|
|
|
type = build_exception_variant
|
|
|
|
|
(build_function_type (ptr_type_node, args),
|
|
|
|
|
TYPE_RAISES_EXCEPTIONS (type));
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
default:;
|
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
coerce_delete_type (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
2000-11-08 15:03:32 +01:00
|
|
|
|
int e = 0;
|
|
|
|
|
tree args = TYPE_ARG_TYPES (type);
|
|
|
|
|
|
|
|
|
|
my_friendly_assert (TREE_CODE (type) == FUNCTION_TYPE, 20001107);
|
1997-02-04 03:31:49 +01:00
|
|
|
|
|
2000-11-08 15:03:32 +01:00
|
|
|
|
if (!same_type_p (TREE_TYPE (type), void_type_node))
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
e = 1, error ("`operator delete' must return type `%T'", void_type_node);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
2000-11-08 15:03:32 +01:00
|
|
|
|
if (!args || args == void_list_node
|
|
|
|
|
|| !same_type_p (TREE_VALUE (args), ptr_type_node))
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
2000-11-08 15:03:32 +01:00
|
|
|
|
e = 2;
|
|
|
|
|
if (args && args != void_list_node)
|
|
|
|
|
args = TREE_CHAIN (args);
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`operator delete' takes type `%T' as first parameter", ptr_type_node);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
2000-11-08 15:03:32 +01:00
|
|
|
|
switch (e)
|
|
|
|
|
{
|
|
|
|
|
case 2:
|
|
|
|
|
args = tree_cons (NULL_TREE, ptr_type_node, args);
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
case 1:
|
|
|
|
|
type = build_exception_variant
|
|
|
|
|
(build_function_type (void_type_node, args),
|
|
|
|
|
TYPE_RAISES_EXCEPTIONS (type));
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
default:;
|
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
1994-04-08 08:08:43 +02:00
|
|
|
|
mark_vtable_entries (decl)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
tree decl;
|
|
|
|
|
{
|
1995-10-12 03:33:51 +01:00
|
|
|
|
tree entries = CONSTRUCTOR_ELTS (DECL_INITIAL (decl));
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
for (; entries; entries = TREE_CHAIN (entries))
|
|
|
|
|
{
|
2001-07-21 11:42:21 +02:00
|
|
|
|
tree fnaddr = TREE_VALUE (entries);
|
1999-04-13 02:39:32 +02:00
|
|
|
|
tree fn;
|
2001-07-21 11:42:21 +02:00
|
|
|
|
|
2001-09-21 18:58:22 +02:00
|
|
|
|
if (TREE_CODE (fnaddr) != ADDR_EXPR
|
|
|
|
|
&& TREE_CODE (fnaddr) != FDESC_EXPR)
|
2000-01-17 05:08:01 +01:00
|
|
|
|
/* This entry is an offset: a virtual base class offset, a
|
2001-03-22 01:55:13 +01:00
|
|
|
|
virtual call offset, an RTTI offset, etc. */
|
1999-04-13 02:39:32 +02:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
fn = TREE_OPERAND (fnaddr, 0);
|
1994-04-08 08:08:43 +02:00
|
|
|
|
TREE_ADDRESSABLE (fn) = 1;
|
2000-06-23 03:14:40 +02:00
|
|
|
|
/* When we don't have vcall offsets, we output thunks whenever
|
|
|
|
|
we output the vtables that contain them. With vcall offsets,
|
|
|
|
|
we know all the thunks we'll need when we emit a virtual
|
|
|
|
|
function, so we emit the thunks there instead. */
|
|
|
|
|
if (DECL_THUNK_P (fn))
|
2001-06-06 23:52:52 +02:00
|
|
|
|
use_thunk (fn, /*emit_p=*/0);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
mark_used (fn);
|
1994-04-22 01:30:18 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1996-08-26 22:32:48 +02:00
|
|
|
|
/* Set DECL up to have the closest approximation of "initialized common"
|
|
|
|
|
linkage available. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
comdat_linkage (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
|
|
|
|
if (flag_weak)
|
1996-09-18 19:20:21 +02:00
|
|
|
|
make_decl_one_only (decl);
|
2001-02-04 09:35:11 +01:00
|
|
|
|
else if (TREE_CODE (decl) == FUNCTION_DECL
|
|
|
|
|
|| (TREE_CODE (decl) == VAR_DECL && DECL_ARTIFICIAL (decl)))
|
|
|
|
|
/* We can just emit function and compiler-generated variables
|
|
|
|
|
statically; having multiple copies is (for the most part) only
|
|
|
|
|
a waste of space.
|
|
|
|
|
|
|
|
|
|
There are two correctness issues, however: the address of a
|
|
|
|
|
template instantiation with external linkage should be the
|
2000-10-31 02:30:59 +01:00
|
|
|
|
same, independent of what translation unit asks for the
|
|
|
|
|
address, and this will not hold when we emit multiple copies of
|
2001-02-04 09:35:11 +01:00
|
|
|
|
the function. However, there's little else we can do.
|
|
|
|
|
|
2001-07-21 02:03:21 +02:00
|
|
|
|
Also, by default, the typeinfo implementation assumes that
|
|
|
|
|
there will be only one copy of the string used as the name for
|
|
|
|
|
each type. Therefore, if weak symbols are unavailable, the
|
|
|
|
|
run-time library should perform a more conservative check; it
|
|
|
|
|
should perform a string comparison, rather than an address
|
|
|
|
|
comparison. */
|
1996-09-18 19:20:21 +02:00
|
|
|
|
TREE_PUBLIC (decl) = 0;
|
1999-03-23 03:33:34 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
1999-03-25 20:45:25 +01:00
|
|
|
|
/* Static data member template instantiations, however, cannot
|
|
|
|
|
have multiple copies. */
|
1999-03-23 03:33:34 +01:00
|
|
|
|
if (DECL_INITIAL (decl) == 0
|
|
|
|
|
|| DECL_INITIAL (decl) == error_mark_node)
|
|
|
|
|
DECL_COMMON (decl) = 1;
|
|
|
|
|
else if (EMPTY_CONSTRUCTOR_P (DECL_INITIAL (decl)))
|
|
|
|
|
{
|
|
|
|
|
DECL_COMMON (decl) = 1;
|
|
|
|
|
DECL_INITIAL (decl) = error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We can't do anything useful; leave vars for explicit
|
|
|
|
|
instantiation. */
|
|
|
|
|
DECL_EXTERNAL (decl) = 1;
|
|
|
|
|
DECL_NOT_REALLY_EXTERN (decl) = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
1997-12-12 07:20:32 +01:00
|
|
|
|
|
|
|
|
|
if (DECL_LANG_SPECIFIC (decl))
|
|
|
|
|
DECL_COMDAT (decl) = 1;
|
1996-08-26 22:32:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-21 07:42:51 +02:00
|
|
|
|
/* For win32 we also want to put explicit instantiations in
|
|
|
|
|
linkonce sections, so that they will be merged with implicit
|
|
|
|
|
instantiations; otherwise we get duplicate symbol errors. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
maybe_make_one_only (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
1999-11-02 08:33:05 +01:00
|
|
|
|
/* We used to say that this was not necessary on targets that support weak
|
|
|
|
|
symbols, because the implicit instantiations will defer to the explicit
|
|
|
|
|
one. However, that's not actually the case in SVR4; a strong definition
|
|
|
|
|
after a weak one is an error. Also, not making explicit
|
|
|
|
|
instantiations one_only means that we can end up with two copies of
|
|
|
|
|
some template instantiations. */
|
2001-05-21 17:55:40 +02:00
|
|
|
|
if (! flag_weak)
|
1998-05-21 07:42:51 +02:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* We can't set DECL_COMDAT on functions, or finish_file will think
|
1999-03-23 03:33:34 +01:00
|
|
|
|
we can get away with not emitting them if they aren't used. We need
|
|
|
|
|
to for variables so that cp_finish_decl will update their linkage,
|
|
|
|
|
because their DECL_INITIAL may not have been set properly yet. */
|
1998-05-21 07:42:51 +02:00
|
|
|
|
|
1999-03-23 03:33:34 +01:00
|
|
|
|
make_decl_one_only (decl);
|
|
|
|
|
|
2002-03-15 10:54:42 +01:00
|
|
|
|
if (TREE_CODE (decl) == VAR_DECL)
|
|
|
|
|
{
|
|
|
|
|
DECL_COMDAT (decl) = 1;
|
|
|
|
|
/* Mark it needed so we don't forget to emit it. */
|
|
|
|
|
TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)) = 1;
|
|
|
|
|
}
|
1998-05-21 07:42:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-03-04 01:45:24 +01:00
|
|
|
|
/* Returns the virtual function with which the vtable for TYPE is
|
|
|
|
|
emitted, or NULL_TREE if that heuristic is not applicable to TYPE. */
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
key_method (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
tree method;
|
|
|
|
|
|
|
|
|
|
if (TYPE_FOR_JAVA (type)
|
2000-04-20 07:53:58 +02:00
|
|
|
|
|| CLASSTYPE_TEMPLATE_INSTANTIATION (type)
|
2000-03-04 01:45:24 +01:00
|
|
|
|
|| CLASSTYPE_INTERFACE_KNOWN (type))
|
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
|
|
for (method = TYPE_METHODS (type); method != NULL_TREE;
|
|
|
|
|
method = TREE_CHAIN (method))
|
|
|
|
|
if (DECL_VINDEX (method) != NULL_TREE
|
2001-04-06 08:33:07 +02:00
|
|
|
|
&& ! DECL_DECLARED_INLINE_P (method)
|
2001-06-06 23:52:52 +02:00
|
|
|
|
&& (! DECL_PURE_VIRTUAL_P (method)
|
|
|
|
|
#if 0
|
|
|
|
|
/* This would be nice, but we didn't think of it in time. */
|
|
|
|
|
|| DECL_DESTRUCTOR_P (method)
|
|
|
|
|
#endif
|
|
|
|
|
))
|
2000-03-04 01:45:24 +01:00
|
|
|
|
return method;
|
|
|
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
1995-01-31 23:18:02 +01:00
|
|
|
|
/* Set TREE_PUBLIC and/or DECL_EXTERN on the vtable DECL,
|
1994-04-22 01:30:18 +02:00
|
|
|
|
based on TYPE and other static flags.
|
|
|
|
|
|
|
|
|
|
Note that anything public is tagged TREE_PUBLIC, whether
|
|
|
|
|
it's public in this file or in another one. */
|
|
|
|
|
|
1994-07-09 09:13:10 +02:00
|
|
|
|
void
|
1995-02-18 23:06:40 +01:00
|
|
|
|
import_export_vtable (decl, type, final)
|
|
|
|
|
tree decl, type;
|
|
|
|
|
int final;
|
1994-04-22 01:30:18 +02:00
|
|
|
|
{
|
1995-02-18 23:06:40 +01:00
|
|
|
|
if (DECL_INTERFACE_KNOWN (decl))
|
|
|
|
|
return;
|
|
|
|
|
|
1998-08-27 21:03:59 +02:00
|
|
|
|
if (TYPE_FOR_JAVA (type))
|
1994-04-22 01:30:18 +02:00
|
|
|
|
{
|
|
|
|
|
TREE_PUBLIC (decl) = 1;
|
1998-08-27 21:03:59 +02:00
|
|
|
|
DECL_EXTERNAL (decl) = 1;
|
1995-02-18 23:06:40 +01:00
|
|
|
|
DECL_INTERFACE_KNOWN (decl) = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (CLASSTYPE_INTERFACE_KNOWN (type))
|
|
|
|
|
{
|
|
|
|
|
TREE_PUBLIC (decl) = 1;
|
2001-03-22 01:55:13 +01:00
|
|
|
|
DECL_EXTERNAL (decl) = CLASSTYPE_INTERFACE_ONLY (type);
|
1995-02-18 23:06:40 +01:00
|
|
|
|
DECL_INTERFACE_KNOWN (decl) = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1995-03-16 00:03:59 +01:00
|
|
|
|
/* We can only wait to decide if we have real non-inline virtual
|
|
|
|
|
functions in our class, or if we come from a template. */
|
1995-02-18 23:06:40 +01:00
|
|
|
|
|
2000-03-04 01:45:24 +01:00
|
|
|
|
int found = (CLASSTYPE_TEMPLATE_INSTANTIATION (type)
|
|
|
|
|
|| key_method (type));
|
1995-02-18 23:06:40 +01:00
|
|
|
|
|
|
|
|
|
if (final || ! found)
|
|
|
|
|
{
|
1996-08-26 22:32:48 +02:00
|
|
|
|
comdat_linkage (decl);
|
1995-02-18 23:06:40 +01:00
|
|
|
|
DECL_EXTERNAL (decl) = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
TREE_PUBLIC (decl) = 1;
|
|
|
|
|
DECL_EXTERNAL (decl) = 1;
|
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-23 19:51:17 +02:00
|
|
|
|
/* Determine whether or not we want to specifically import or export CTYPE,
|
|
|
|
|
using various heuristics. */
|
1998-07-23 04:29:34 +02:00
|
|
|
|
|
2000-02-27 03:46:57 +01:00
|
|
|
|
static void
|
1998-07-23 04:29:34 +02:00
|
|
|
|
import_export_class (ctype)
|
|
|
|
|
tree ctype;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1998-07-23 19:51:17 +02:00
|
|
|
|
/* -1 for imported, 1 for exported. */
|
|
|
|
|
int import_export = 0;
|
|
|
|
|
|
2000-02-27 03:46:57 +01:00
|
|
|
|
/* It only makes sense to call this function at EOF. The reason is
|
|
|
|
|
that this function looks at whether or not the first non-inline
|
|
|
|
|
non-abstract virtual member function has been defined in this
|
|
|
|
|
translation unit. But, we can't possibly know that until we've
|
|
|
|
|
seen the entire translation unit. */
|
|
|
|
|
my_friendly_assert (at_eof, 20000226);
|
|
|
|
|
|
1998-07-23 19:51:17 +02:00
|
|
|
|
if (CLASSTYPE_INTERFACE_KNOWN (ctype))
|
|
|
|
|
return;
|
|
|
|
|
|
1999-03-03 12:24:45 +01:00
|
|
|
|
/* If MULTIPLE_SYMBOL_SPACES is defined and we saw a #pragma interface,
|
|
|
|
|
we will have CLASSTYPE_INTERFACE_ONLY set but not
|
|
|
|
|
CLASSTYPE_INTERFACE_KNOWN. In that case, we don't want to use this
|
|
|
|
|
heuristic because someone will supply a #pragma implementation
|
|
|
|
|
elsewhere, and deducing it here would produce a conflict. */
|
|
|
|
|
if (CLASSTYPE_INTERFACE_ONLY (ctype))
|
|
|
|
|
return;
|
|
|
|
|
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
if (lookup_attribute ("dllimport", TYPE_ATTRIBUTES (ctype)))
|
2001-06-27 08:55:29 +02:00
|
|
|
|
import_export = -1;
|
Table-driven attributes.
* c-decl.c, config/alpha/alpha.c, config/arc/arc.c,
config/arm/arm.c, config/arm/pe.c, config/avr/avr.c,
config/avr/avr.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/h8300/h8300.c, config/i386/cygwin.h, config/i386/winnt.c,
config/m32r/m32r.c, config/mcore/mcore.c, config/sh/sh.c,
config/stormy16/stormy16.h, config/v850/v850.c, doc/c-tree.texi,
doc/tm.texi, ggc-common.c, integrate.c, print-tree.c, tree.c,
tree.h: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* tree.h (struct tree_decl): Change machine_attributes to
attributes.
* doc/c-tree.texi: Document that all attributes are now attached
to decls and types.
* c-common.c (add_attribute, attrtab, attrtab_idx,
default_valid_lang_attribute, valid_lang_attribute): Remove.
(attribute_tables, attributes_initialized,
c_common_attribute_table, default_lang_attribute_table): New
variables.
(handle_packed_attribute, handle_nocommon_attribute,
handle_common_attribute, handle_noreturn_attribute,
handle_unused_attribute, handle_const_attribute,
handle_transparent_union_attribute, handle_constructor_attribute,
handle_destructor_attribute, handle_mode_attribute,
handle_section_attribute, handle_aligned_attribute,
handle_weak_attribute, handle_alias_attribute,
handle_no_instrument_function_attribute,
handle_no_check_memory_usage_attribute, handle_malloc_attribute,
handle_no_limit_stack_attribute, handle_pure_attribute): New
functions.
(init_attributes, decl_attributes): Rewrite to implement
table-driven attributes.
* c-common.h (enum attribute_flags): Move to tree.h.
* c-format.c (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Rename to
handle_format_attribute and handle_format_arg_attribute. Update
for table-driven attributes.
* c-common.h (decl_handle_format_attribute,
decl_handle_format_arg_attribute): Remove prototypes.
(handle_format_attribute, handle_format_arg_attribute): Add
prototypes.
* c-decl.c (grokdeclarator): Handle attributes nested inside
declarators.
* c-parse.in (setattrs, maybe_setattrs): Remove.
(maybe_type_quals_setattrs): Rename to maybe_type_quals_attrs.
Update to handle nested attributes properly.
(maybe_resetattrs, after_type_declarator,
parm_declarator_nostarttypename, notype_declarator, absdcl1_noea,
absdcl1_ea, direct_absdcl1): Update to handle nested attributes
properly.
(make_pointer_declarator): Update to handle nested attributes
properly.
* doc/extend.texi: Update documentation of limits of attributes
syntax. Warn about problems with attribute semantics in C++.
* target.h (struct target): Remove valid_decl_attribute and
valid_type_attribute. Add attribute_table and
function_attribute_inlinable_p.
* target-def.h (TARGET_VALID_DECL_ATTRIBUTE,
TARGET_VALID_TYPE_ATTRIBUTE): Remove.
(TARGET_ATTRIBUTE_TABLE, TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P):
Add.
(TARGET_INITIALIZER): Update.
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): Remove default
definition.
(function_attribute_inlinable_p): New function. Check for the
presence of any machine attributes before using
targetm.function_attribute_inlinable_p.
(function_cannot_inline_p): Update.
* Makefile.in (integrate.o): Update dependencies.
* doc/tm.texi: Update documentation of target attributes and
example definition of TARGET_VALID_TYPE_ATTRIBUTE.
* tree.c (default_valid_attribute_p, valid_machine_attribute):
Remove.
(default_target_attribute_table,
default_function_attribute_inlinable_p): New.
(lookup_attribute): Update comment to clarify handling of multiple
attributes with the same name.
(merge_attributes, attribute_list_contained): Allow multiple
attributes with the same name but different arguments to appear in
the same attribute list.
* tree.h (default_valid_attribute_p): Remove prototype.
(struct attribute_spec): New.
(default_target_attribute_table): Declare.
(enum attribute_flags): Move from c-common.h. Add
ATTR_FLAG_TYPE_IN_PLACE.
(default_function_attribute_inlinable_p): Declare.
* config/alpha/alpha.c (vms_valid_decl_attribute_p): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(vms_attribute_table): New.
* config/arc/arc.c (arc_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arc_attribute_table, arc_handle_interrupt_attribute): New.
* config/arm/arm.c (arm_valid_type_attribute_p,
arm_valid_decl_attribute_p, arm_pe_valid_decl_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(arm_attribute_table, arm_handle_fndecl_attribute,
arm_handle_isr_attribute): New.
* config/avr/avr.c (avr_valid_type_attribute,
avr_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE, TARGET_VALID_TYPE_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(avr_attribute_table, avr_handle_progmem_attribute,
avr_handle_fndecl_attribute): New.
* config/c4x/c4x.c (c4x_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(c4x_attribute_table, c4x_handle_fntype_attribute): New.
* config/h8300/h8300.c (h8300_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(h8300_attribute_table, h8300_handle_fndecl_attribute,
h8300_handle_eightbit_data_attribute,
h8300_handle_tiny_data_attribute): New.
* config/i386/i386-protos.h (ix86_valid_type_attribute_p,
i386_pe_valid_decl_attribute_p, i386_pe_valid_type_attribute_p):
Remove prototypes.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New
declarations.
* config/i386/i386.c (ix86_valid_type_attribute_p: Remove.
(TARGET_VALID_TYPE_ATTRIBUTE, TARGET_VALID_DECL_ATTRIBUTE): Don't
define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ix86_attribute_table, ix86_handle_cdecl_attribute,
ix86_handle_regparm_attribute): New.
* config/i386/winnt.c (i386_pe_valid_decl_attribute_p,
i386_pe_valid_type_attribute_p): Remove.
(ix86_handle_dll_attribute, ix86_handle_shared_attribute): New.
* config/ia64/ia64.c (ia64_valid_type_attribute): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ia64_attribute_table): New.
* config/m32r/m32r.c (m32r_valid_decl_attribute, interrupt_ident1,
interrupt_ident2, model_ident1, model_ident2): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(init_idents): Update.
(m32r_attribute_table, m32r_handle_model_attribute): New.
* config/m68hc11/m68hc11.c (m68hc11_valid_type_attribute_p):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(m68hc11_attribute_table, m68hc11_handle_fntype_attribute): New.
* config/mcore/mcore.c (mcore_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(mcore_attribute_table, mcore_handle_naked_attribute): New.
* config/ns32k/ns32k.c (ns32k_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(ns32k_attribute_table, ns32k_handle_fntype_attribute): New.
* config/rs6000/rs6000.c (rs6000_valid_type_attribute_p): Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(rs6000_attribute_table, rs6000_handle_longcall_attribute): New.
* config/sh/sh.c (sh_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(sh_attribute_table, sh_handle_interrupt_handler_attribute,
sh_handle_sp_switch_attribute, sh_handle_trap_exit_attribute):
New.
* config/stormy16/stormy16.c (stormy16_valid_type_attribute):
Remove.
(TARGET_VALID_TYPE_ATTRIBUTE): Don't define
(TARGET_ATTRIBUTE_TABLE): Define.
(stormy16_attribute_table, stormy16_handle_interrupt_attribute):
New.
* config/v850/v850.c (v850_valid_decl_attribute): Remove.
(TARGET_VALID_DECL_ATTRIBUTE): Don't define.
(TARGET_ATTRIBUTE_TABLE): Define.
(v850_attribute_table, v850_handle_interrupt_attribute,
v850_handle_data_area_attribute): New.
* config/v850/v850-c.c (mark_current_function_as_interrupt):
Return void. Call decl_attributes instead of
valid_machine_attribute.
cp:
Table-driven attributes.
* decl.c: Rename DECL_MACHINE_ATTRIBUTES to DECL_ATTRIBUTES.
* decl2.c (cplus_decl_attributes): Only take one attributes
parameter.
* cp-tree.c (cplus_decl_attributes): Update prototype.
* class.c (finish_struct), decl.c (start_decl, start_function),
decl2.c (grokfield), friend.c (do_friend), parse.y
(parse_bitfield): Update calls to cplus_decl_attributes.
* decl.c (grokdeclarator): Take a pointer to a single ordinary
attribute list.
* decl.h (grokdeclarator): Update prototype.
* decl2.c (grokfield): Take a single ordinary attribute list.
* friend.c (do_friend): Likewise.
* decl.c (shadow_tag, groktypename, start_decl,
start_handler_parms, grokdeclarator, grokparms, start_function,
start_method), decl2.c (grokfield, grokbitfield, grokoptypename),
parse.y (parse_field, parse_bitfield, component_decl_1), pt.c
(process_template_parm, do_decl_instantiation): Pass single
ordinary attribute lists around.
* decl.c (grokdeclarator): Correct handling of nested attributes.
Revert the patch
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokdeclarator): Embedded attrs bind to the right,
not the left.
.
* cp-tree.h (cp_valid_lang_attribute): Remove declaration
(cp_attribute_table): Declare.
* decl.c (valid_lang_attribute): Don't define.
(lang_attribute_table): Define.
(init_decl_processing): Initialize lang_attribute_table instead of
valid_lang_attribute.
* tree.c (cp_valid_lang_attribute): Remove.
(handle_java_interface_attribute, handle_com_interface_attribute,
handle_init_priority_attribute): New functions.
(cp_attribute_table): New array.
* decl2.c (import_export_class): Don't use
targetm.valid_type_attribute.
testsuite:
Table-driven attributes.
* g++.dg/ext/attrib1.C: New test.
From-SVN: r45718
2001-09-21 03:27:06 +02:00
|
|
|
|
else if (lookup_attribute ("dllexport", TYPE_ATTRIBUTES (ctype)))
|
2001-06-27 08:55:29 +02:00
|
|
|
|
import_export = 1;
|
1998-07-23 19:51:17 +02:00
|
|
|
|
|
|
|
|
|
/* If we got -fno-implicit-templates, we import template classes that
|
|
|
|
|
weren't explicitly instantiated. */
|
|
|
|
|
if (import_export == 0
|
|
|
|
|
&& CLASSTYPE_IMPLICIT_INSTANTIATION (ctype)
|
|
|
|
|
&& ! flag_implicit_templates)
|
|
|
|
|
import_export = -1;
|
1994-04-22 01:30:18 +02:00
|
|
|
|
|
1998-07-23 19:51:17 +02:00
|
|
|
|
/* Base our import/export status on that of the first non-inline,
|
2000-03-04 01:45:24 +01:00
|
|
|
|
non-pure virtual function, if any. */
|
1998-07-23 19:51:17 +02:00
|
|
|
|
if (import_export == 0
|
2000-04-20 07:53:58 +02:00
|
|
|
|
&& TYPE_POLYMORPHIC_P (ctype))
|
1994-03-24 00:33:53 +01:00
|
|
|
|
{
|
2000-03-04 01:45:24 +01:00
|
|
|
|
tree method = key_method (ctype);
|
|
|
|
|
if (method)
|
|
|
|
|
import_export = (DECL_REALLY_EXTERN (method) ? -1 : 1);
|
1994-03-24 00:33:53 +01:00
|
|
|
|
}
|
1999-01-14 11:42:12 +01:00
|
|
|
|
|
|
|
|
|
#ifdef MULTIPLE_SYMBOL_SPACES
|
|
|
|
|
if (import_export == -1)
|
|
|
|
|
import_export = 0;
|
1996-09-12 21:19:15 +02:00
|
|
|
|
#endif
|
1998-07-23 19:51:17 +02:00
|
|
|
|
|
|
|
|
|
if (import_export)
|
|
|
|
|
{
|
|
|
|
|
SET_CLASSTYPE_INTERFACE_KNOWN (ctype);
|
|
|
|
|
CLASSTYPE_INTERFACE_ONLY (ctype) = (import_export < 0);
|
|
|
|
|
}
|
1998-07-23 04:29:34 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-08-28 18:11:35 +02:00
|
|
|
|
/* We need to describe to the assembler the relationship between
|
1998-09-01 15:17:36 +02:00
|
|
|
|
a vtable and the vtable of the parent class. */
|
1998-08-28 18:11:35 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
output_vtable_inherit (vars)
|
|
|
|
|
tree vars;
|
|
|
|
|
{
|
|
|
|
|
tree parent;
|
2001-10-11 20:48:42 +02:00
|
|
|
|
rtx child_rtx, parent_rtx;
|
1998-08-28 18:11:35 +02:00
|
|
|
|
|
2001-10-11 20:48:42 +02:00
|
|
|
|
child_rtx = XEXP (DECL_RTL (vars), 0); /* strip the mem ref */
|
1998-08-28 18:11:35 +02:00
|
|
|
|
|
|
|
|
|
parent = binfo_for_vtable (vars);
|
|
|
|
|
|
|
|
|
|
if (parent == TYPE_BINFO (DECL_CONTEXT (vars)))
|
2001-10-11 20:48:42 +02:00
|
|
|
|
parent_rtx = const0_rtx;
|
1998-08-28 18:11:35 +02:00
|
|
|
|
else if (parent)
|
|
|
|
|
{
|
Correct many new ABI issues regarding vbase and vcall offset layout.
Correct many new ABI issues regarding vbase and vcall offset
layout.
* cp-tree.h (BINFO_VTABLE): Document.
(struct lang_type): Tweak formatting.
(BINFO_PRIMARY_BINFO): Add to documentation.
(CLASSTYPE_VSIZE): Fix typo in comment.
(CLASSTYPE_VBASECLASSES): Update documentation.
(BINFO_VBASE_MARKED): Remove.
(SET_BINFO_VBASE_MARKED): Likewise.
(CLEAR_BINFO_VBASE_MARKED): Likewise.
(BINFO_FIELDS_MARKED): Remove.
(SET_BINFO_FIELDS_MARKED): Likewise.
(CLEAR_BINFO_FIELDS_MARKED): Likewise.
(enum access_kind): New enumeration.
(num_extra_vtbl_entries): Remove declaration.
(size_extra_vtbl_entries): Likewise.
(get_vtbl_decl_for_binfo): New function.
(dfs_vbase_unmark): Remove declaration.
(mark_primary_bases): Likewise.
* class.c (SAME_FN): Remove.
(struct vcall_offset_data_s): Move definition.
(build_vbase_pointer): Use `build', not `build_binary_op', to
access the vbase pointer under the new ABI.
(build_vtable_entry_ref): Use get_vtbl_decl_for_binfo.
(build_primary_vtable): Likewise.
(dfs_mark_primary_bases): Move here from search.c.
(mark_primary_bases): Likewise.
(determine_primary_bases): Under the new ABI, don't make a base
class a primary base just because we don't yet have any virtual
functions.
(layout_vtable_decl): Use get_vtbl_decl_for_binfo.
(num_vfun_entries): Remove.
(dfs_count_virtuals): Likewise.
(num_extra_vtbl_entries): Likewise.
(size_extra_vtbl_entries): Likewise.
(layout_virtual_bases): Iterate in inheritance graph order under
the new ABI.
(finish_struct_1): Use TYPE_VFIELD, not CLASSTYPE_VSIZE, to
indicate that a vfield is present.
(init_class_processing): Initialize access_public_node, etc., from
ak_public, etc.
(get_vtbl_decl_for_binfo): New function.
(dump_class_hierarchy_r): Likewise.
(dump_class_hierarchy): Use it.
(finish_vtbls): Build the vtbls in inheritance graph order.
(dfs_finish_vtbls): Adjust call to build_vtbl_initializer.
(initialize_vtable): Use get_vtbl_decl_for_binfo.
(accumulate_vtbl_inits): Add comments explaining why a pre-order
walk is required.
(dfs_accumulate_vtbl_inits): Set BINFO_VTABLE to the location
where the vptr points, even for primary vtables.
(build_vtbl_initializer): Adjust handling of vbase and vcall
offsets.
(build_vcall_and_vbase_vtable_entries): New function.
(dfs_build_vbase_offset_vtbl_entries): Remove.
(build_vbase_offset_vtbl_entries): Reimplement.
(dfs_build_vcall_offset_vtbl_entries): Don't include virtuals that
were already handled in a primary base class vtable.
(build_vcall_offset_vtbl_entries): Adjust.
(build_rtti_vtbl_entries): Adjust.
* decl2.c (output_vtable_inherit): Use get_vtbl_decl_for_binfo.
* init.c (expand_virtual_init): Simplify.
* repo.c (repo_get_id): Use get_vtbl_decl_for_binfo.
* rtti.c (create_pseudo_type_info): Adjust calculation of vptr.
* search.c (BINFO_ACCESS): New macro.
(SET_BINFO_ACCESS): Likewise.
(dfs_access_in_type): Manipulate access_kinds, not access nodes.
(access_in_type): Likewise.
(dfs_accessible_p): Likewise.
(protected_accessible_p): Likewise.
(lookup_fnfields_1): Adjust documentation.
(dfs_mark_primary_bases): Move to class.c
(mark_primary_bases): Likewise.
(dfs_vbase_unmark): Remove.
(virtual_context): Use BINFO_FOR_VBASE.
(dfs_get_vbase_types): Simplify.
(dfs_build_inheritance_graph_order): New function.
(get_vbase_types): Use it.
* tree.c (debug_binfo): Use get_vtbl_decl_for_binfo.
* tinfo.cc (get_vbase_offset): New function.
(__vmi_class_type_info::do_find_public_src): Use it.
(__vmi_class_type_info::do_dyncast): Likewise.
(__vmi_class_type_info::do_upcast): Likewise.
From-SVN: r32905
2000-04-04 20:13:22 +02:00
|
|
|
|
parent = get_vtbl_decl_for_binfo (TYPE_BINFO (BINFO_TYPE (parent)));
|
2001-10-11 20:48:42 +02:00
|
|
|
|
parent_rtx = XEXP (DECL_RTL (parent), 0); /* strip the mem ref */
|
1998-08-28 18:11:35 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
call.c, [...]: Change my_fancy_abort() to abort().
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort().
From-SVN: r49139
2002-01-23 15:26:07 +01:00
|
|
|
|
abort ();
|
1998-08-28 18:11:35 +02:00
|
|
|
|
|
2001-10-11 20:48:42 +02:00
|
|
|
|
assemble_vtable_inherit (child_rtx, parent_rtx);
|
1998-08-28 18:11:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
1996-03-21 20:46:11 +01:00
|
|
|
|
static int
|
1999-04-23 01:13:12 +02:00
|
|
|
|
finish_vtable_vardecl (t, data)
|
|
|
|
|
tree *t;
|
|
|
|
|
void *data ATTRIBUTE_UNUSED;
|
1995-01-31 23:18:02 +01:00
|
|
|
|
{
|
1999-04-23 01:13:12 +02:00
|
|
|
|
tree vars = *t;
|
1998-10-28 21:29:09 +01:00
|
|
|
|
tree ctype = DECL_CONTEXT (vars);
|
|
|
|
|
import_export_class (ctype);
|
|
|
|
|
import_export_vtable (vars, ctype, 1);
|
|
|
|
|
|
1998-08-27 21:03:59 +02:00
|
|
|
|
if (! DECL_EXTERNAL (vars)
|
2000-03-04 01:45:24 +01:00
|
|
|
|
&& DECL_NEEDED_P (vars)
|
1996-03-21 20:46:11 +01:00
|
|
|
|
&& ! TREE_ASM_WRITTEN (vars))
|
1995-01-31 23:18:02 +01:00
|
|
|
|
{
|
2000-01-24 11:59:02 +01:00
|
|
|
|
if (TREE_TYPE (vars) == void_type_node)
|
|
|
|
|
/* It is a dummy vtable made by get_vtable_decl. Ignore it. */
|
|
|
|
|
return 0;
|
|
|
|
|
|
1994-02-24 02:02:37 +01:00
|
|
|
|
/* Write it out. */
|
1994-04-08 08:08:43 +02:00
|
|
|
|
mark_vtable_entries (vars);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
if (TREE_TYPE (DECL_INITIAL (vars)) == 0)
|
1995-03-16 00:03:59 +01:00
|
|
|
|
store_init_value (vars, DECL_INITIAL (vars));
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1996-12-18 02:44:21 +01:00
|
|
|
|
if (write_symbols == DWARF_DEBUG || write_symbols == DWARF2_DEBUG)
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
|
|
|
|
/* Mark the VAR_DECL node representing the vtable itself as a
|
|
|
|
|
"gratuitous" one, thereby forcing dwarfout.c to ignore it.
|
|
|
|
|
It is rather important that such things be ignored because
|
|
|
|
|
any effort to actually generate DWARF for them will run
|
|
|
|
|
into trouble when/if we encounter code like:
|
|
|
|
|
|
|
|
|
|
#pragma interface
|
|
|
|
|
struct S { virtual void member (); };
|
|
|
|
|
|
|
|
|
|
because the artificial declaration of the vtable itself (as
|
|
|
|
|
manufactured by the g++ front end) will say that the vtable
|
|
|
|
|
is a static member of `S' but only *after* the debug output
|
|
|
|
|
for the definition of `S' has already been output. This causes
|
|
|
|
|
grief because the DWARF entry for the definition of the vtable
|
|
|
|
|
will try to refer back to an earlier *declaration* of the
|
|
|
|
|
vtable as a static member of `S' and there won't be one.
|
|
|
|
|
We might be able to arrange to have the "vtable static member"
|
|
|
|
|
attached to the member list for `S' before the debug info for
|
|
|
|
|
`S' get written (which would solve the problem) but that would
|
|
|
|
|
require more intrusive changes to the g++ front end. */
|
|
|
|
|
|
|
|
|
|
DECL_IGNORED_P (vars) = 1;
|
|
|
|
|
}
|
|
|
|
|
|
1999-01-19 12:14:54 +01:00
|
|
|
|
/* Always make vtables weak. */
|
|
|
|
|
if (flag_weak)
|
|
|
|
|
comdat_linkage (vars);
|
|
|
|
|
|
2001-05-02 16:38:35 +02:00
|
|
|
|
rest_of_decl_compilation (vars, NULL, 1, 1);
|
1998-08-28 18:11:35 +02:00
|
|
|
|
|
|
|
|
|
if (flag_vtable_gc)
|
|
|
|
|
output_vtable_inherit (vars);
|
|
|
|
|
|
1999-09-29 10:06:21 +02:00
|
|
|
|
/* Because we're only doing syntax-checking, we'll never end up
|
|
|
|
|
actually marking the variable as written. */
|
|
|
|
|
if (flag_syntax_only)
|
|
|
|
|
TREE_ASM_WRITTEN (vars) = 1;
|
|
|
|
|
|
1999-11-16 02:37:39 +01:00
|
|
|
|
/* Since we're writing out the vtable here, also write the debug
|
|
|
|
|
info. */
|
2000-03-04 01:45:24 +01:00
|
|
|
|
note_debug_info_needed (ctype);
|
1999-11-16 02:37:39 +01:00
|
|
|
|
|
1996-03-21 20:46:11 +01:00
|
|
|
|
return 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
2000-03-04 01:45:24 +01:00
|
|
|
|
|
|
|
|
|
/* If the references to this class' vtables were optimized away, still
|
|
|
|
|
emit the appropriate debugging information. See dfs_debug_mark. */
|
|
|
|
|
if (DECL_COMDAT (vars)
|
|
|
|
|
&& CLASSTYPE_DEBUG_REQUESTED (ctype))
|
|
|
|
|
note_debug_info_needed (ctype);
|
1995-03-16 00:03:59 +01:00
|
|
|
|
|
1996-03-21 20:46:11 +01:00
|
|
|
|
return 0;
|
1995-03-16 00:03:59 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-03-21 20:46:11 +01:00
|
|
|
|
static int
|
1999-04-23 01:13:12 +02:00
|
|
|
|
prune_vtable_vardecl (t, data)
|
|
|
|
|
tree *t;
|
|
|
|
|
void *data ATTRIBUTE_UNUSED;
|
1995-03-16 00:03:59 +01:00
|
|
|
|
{
|
1999-04-23 01:13:12 +02:00
|
|
|
|
*t = TREE_CHAIN (*t);
|
1996-03-21 20:46:11 +01:00
|
|
|
|
return 1;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-08-18 22:50:43 +02:00
|
|
|
|
/* Determines the proper settings of TREE_PUBLIC and DECL_EXTERNAL for an
|
1996-02-28 23:01:56 +01:00
|
|
|
|
inline function or template instantiation at end-of-file. */
|
1994-08-18 22:50:43 +02:00
|
|
|
|
|
|
|
|
|
void
|
1996-02-28 23:01:56 +01:00
|
|
|
|
import_export_decl (decl)
|
1994-08-18 22:50:43 +02:00
|
|
|
|
tree decl;
|
|
|
|
|
{
|
1994-11-29 01:59:16 +01:00
|
|
|
|
if (DECL_INTERFACE_KNOWN (decl))
|
1994-08-18 22:50:43 +02:00
|
|
|
|
return;
|
|
|
|
|
|
1998-09-01 15:08:44 +02:00
|
|
|
|
if (DECL_TEMPLATE_INSTANTIATION (decl)
|
|
|
|
|
|| DECL_FRIEND_PSEUDO_TEMPLATE_INSTANTIATION (decl))
|
1994-08-18 22:50:43 +02:00
|
|
|
|
{
|
1996-02-28 23:01:56 +01:00
|
|
|
|
DECL_NOT_REALLY_EXTERN (decl) = 1;
|
1998-09-01 15:08:44 +02:00
|
|
|
|
if ((DECL_IMPLICIT_INSTANTIATION (decl)
|
|
|
|
|
|| DECL_FRIEND_PSEUDO_TEMPLATE_INSTANTIATION (decl))
|
1998-10-04 00:53:37 +02:00
|
|
|
|
&& (flag_implicit_templates
|
2001-04-06 08:33:07 +02:00
|
|
|
|
|| (flag_implicit_inline_templates
|
|
|
|
|
&& DECL_DECLARED_INLINE_P (decl))))
|
1995-05-16 23:10:32 +02:00
|
|
|
|
{
|
1998-01-19 23:41:40 +01:00
|
|
|
|
if (!TREE_PUBLIC (decl))
|
|
|
|
|
/* Templates are allowed to have internal linkage. See
|
|
|
|
|
[basic.link]. */
|
|
|
|
|
;
|
1996-08-26 22:32:48 +02:00
|
|
|
|
else
|
1999-03-23 03:33:34 +01:00
|
|
|
|
comdat_linkage (decl);
|
1995-05-16 23:10:32 +02:00
|
|
|
|
}
|
1994-11-29 01:59:16 +01:00
|
|
|
|
else
|
2002-05-18 06:47:31 +02:00
|
|
|
|
{
|
|
|
|
|
DECL_EXTERNAL (decl) = 1;
|
|
|
|
|
DECL_NOT_REALLY_EXTERN (decl) = 0;
|
|
|
|
|
}
|
1994-08-18 22:50:43 +02:00
|
|
|
|
}
|
|
|
|
|
else if (DECL_FUNCTION_MEMBER_P (decl))
|
|
|
|
|
{
|
2001-04-06 08:33:07 +02:00
|
|
|
|
if (!DECL_DECLARED_INLINE_P (decl))
|
1994-08-18 22:50:43 +02:00
|
|
|
|
{
|
2001-04-04 01:37:53 +02:00
|
|
|
|
tree ctype = DECL_CONTEXT (decl);
|
|
|
|
|
import_export_class (ctype);
|
|
|
|
|
if (CLASSTYPE_INTERFACE_KNOWN (ctype))
|
|
|
|
|
{
|
|
|
|
|
DECL_NOT_REALLY_EXTERN (decl)
|
|
|
|
|
= ! (CLASSTYPE_INTERFACE_ONLY (ctype)
|
2001-04-06 08:33:07 +02:00
|
|
|
|
|| (DECL_DECLARED_INLINE_P (decl)
|
|
|
|
|
&& ! flag_implement_inlines
|
2001-04-04 01:37:53 +02:00
|
|
|
|
&& !DECL_VINDEX (decl)));
|
|
|
|
|
|
2002-05-18 06:47:31 +02:00
|
|
|
|
if (!DECL_NOT_REALLY_EXTERN (decl))
|
|
|
|
|
DECL_EXTERNAL (decl) = 1;
|
|
|
|
|
|
2001-04-04 01:37:53 +02:00
|
|
|
|
/* Always make artificials weak. */
|
|
|
|
|
if (DECL_ARTIFICIAL (decl) && flag_weak)
|
|
|
|
|
comdat_linkage (decl);
|
|
|
|
|
else
|
|
|
|
|
maybe_make_one_only (decl);
|
|
|
|
|
}
|
1994-08-18 22:50:43 +02:00
|
|
|
|
}
|
1994-11-29 01:59:16 +01:00
|
|
|
|
else
|
1996-08-26 22:32:48 +02:00
|
|
|
|
comdat_linkage (decl);
|
1994-08-18 22:50:43 +02:00
|
|
|
|
}
|
1994-11-29 01:59:16 +01:00
|
|
|
|
else
|
1996-08-26 22:32:48 +02:00
|
|
|
|
comdat_linkage (decl);
|
1995-04-24 19:27:46 +02:00
|
|
|
|
|
|
|
|
|
DECL_INTERFACE_KNOWN (decl) = 1;
|
1994-08-18 22:50:43 +02:00
|
|
|
|
}
|
1994-11-29 01:59:16 +01:00
|
|
|
|
|
2002-06-30 22:41:38 +02:00
|
|
|
|
/* Here, we only decide whether or not the tinfo node should be
|
2002-07-05 12:40:47 +02:00
|
|
|
|
emitted with the vtable. IS_IN_LIBRARY is non-zero iff the
|
|
|
|
|
typeinfo for TYPE should be in the runtime library. */
|
2002-06-30 22:41:38 +02:00
|
|
|
|
|
|
|
|
|
void
|
2002-07-05 12:40:47 +02:00
|
|
|
|
import_export_tinfo (decl, type, is_in_library)
|
2002-06-30 22:41:38 +02:00
|
|
|
|
tree decl;
|
|
|
|
|
tree type;
|
2002-07-05 12:40:47 +02:00
|
|
|
|
int is_in_library;
|
2002-06-30 22:41:38 +02:00
|
|
|
|
{
|
|
|
|
|
if (DECL_INTERFACE_KNOWN (decl))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (IS_AGGR_TYPE (type))
|
|
|
|
|
import_export_class (type);
|
|
|
|
|
|
|
|
|
|
if (IS_AGGR_TYPE (type) && CLASSTYPE_INTERFACE_KNOWN (type)
|
|
|
|
|
&& TYPE_POLYMORPHIC_P (type)
|
|
|
|
|
/* If -fno-rtti, we're not necessarily emitting this stuff with
|
|
|
|
|
the class, so go ahead and emit it now. This can happen when
|
|
|
|
|
a class is used in exception handling. */
|
|
|
|
|
&& flag_rtti)
|
|
|
|
|
{
|
|
|
|
|
DECL_NOT_REALLY_EXTERN (decl) = !CLASSTYPE_INTERFACE_ONLY (type);
|
|
|
|
|
DECL_COMDAT (decl) = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
DECL_NOT_REALLY_EXTERN (decl) = 1;
|
|
|
|
|
DECL_COMDAT (decl) = 1;
|
|
|
|
|
}
|
2002-07-05 12:40:47 +02:00
|
|
|
|
|
|
|
|
|
/* Now override some cases. */
|
|
|
|
|
if (flag_weak)
|
|
|
|
|
DECL_COMDAT (decl) = 1;
|
|
|
|
|
else if (is_in_library)
|
|
|
|
|
DECL_COMDAT (decl) = 0;
|
|
|
|
|
|
2002-06-30 22:41:38 +02:00
|
|
|
|
DECL_INTERFACE_KNOWN (decl) = 1;
|
|
|
|
|
}
|
|
|
|
|
|
1995-12-19 07:51:14 +01:00
|
|
|
|
tree
|
|
|
|
|
build_cleanup (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
|
|
|
|
tree temp;
|
|
|
|
|
tree type = TREE_TYPE (decl);
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (type) == ARRAY_TYPE)
|
|
|
|
|
temp = decl;
|
|
|
|
|
else
|
|
|
|
|
{
|
c-decl.c (grokdeclarator): Update.
* c-decl.c (grokdeclarator): Update.
* c-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* c-tree.h (c_mark_addressable): New.
* c-typeck.c (default_function_array_conversion, build_unary_op,
build_array_ref, convert_for_assignment): Update.
(mark_addressable): Rename.
* calls.c (try_to_integrate, expand_call): Use langhook.
* expr.c (expand_expr): Use langhook.
* langhooks-def.h (LANG_HOOKS_INITIALIZER): Update.
* langhooks.h (struct lang_hooks): New hook.
* stmt.c (expand_asm_operands): Use langhook.
* tree.h (mark_addressable): Remove.
ada:
* decl.c (gnat_to_gnu_entity): Update.
* gigi.h (mark_addressable): Rename.
* misc.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* trans.c (tree_transform): Update.
* utils.c (create_var_decl): Update.
* util2.c (build_binary_op, build_unary_op,
fill_vms_descriptor): Update.
(mark_addressable): Rename, update.
cp:
* call.c (build_addr_func): Update.
* class.c (resolve_address_of_overloaded_function): Update.
* cp-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* cp-tree.h (cxx_mark_addressable): New.
* decl.c (register_dtor_fn, cxx_maybe_build_cleanup): Update.
* decl2.c (build_cleanup): Update.
* except.c (build_throw): Update.
* init.c (resolve_offset_ref): Update.
* pt.c (convert_nontype_argument): Update.
* semantics.c (finish_asm_stmt, simplify_affr_init_exprs_r): Update.
* typeck.c (decay_conversion, build_array_ref, build_unary_op,
unary_complex_lvalue): Update.
(mark_addressable): Rename.
f:
* com.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
(mark_addressable): Rename.
(ffecom_arrayref_, ffecom_1): Update.
java:
* java-tree.h (java_mark_addressable): New.
* lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* typeck.c (mark_addressable): Rename, update.
objc:
* objc-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
From-SVN: r51705
2002-04-01 22:26:18 +02:00
|
|
|
|
cxx_mark_addressable (decl);
|
1995-12-19 07:51:14 +01:00
|
|
|
|
temp = build1 (ADDR_EXPR, build_pointer_type (type), decl);
|
|
|
|
|
}
|
|
|
|
|
temp = build_delete (TREE_TYPE (temp), temp,
|
2000-05-25 00:56:54 +02:00
|
|
|
|
sfk_complete_destructor,
|
1995-12-19 07:51:14 +01:00
|
|
|
|
LOOKUP_NORMAL|LOOKUP_NONVIRTUAL|LOOKUP_DESTRUCTOR, 0);
|
|
|
|
|
return temp;
|
|
|
|
|
}
|
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
/* Returns the initialization guard variable for the variable DECL,
|
|
|
|
|
which has static storage duration. */
|
2000-06-04 23:12:27 +02:00
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
tree
|
|
|
|
|
get_guard (decl)
|
2000-06-04 23:12:27 +02:00
|
|
|
|
tree decl;
|
1996-04-24 20:30:21 +02:00
|
|
|
|
{
|
2000-06-04 23:12:27 +02:00
|
|
|
|
tree sname;
|
2000-06-30 09:16:35 +02:00
|
|
|
|
tree guard;
|
|
|
|
|
|
2001-02-12 10:58:18 +01:00
|
|
|
|
sname = mangle_guard_variable (decl);
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard = IDENTIFIER_GLOBAL_VALUE (sname);
|
|
|
|
|
if (! guard)
|
|
|
|
|
{
|
|
|
|
|
tree guard_type;
|
|
|
|
|
|
2001-07-21 02:03:21 +02:00
|
|
|
|
/* We use a type that is big enough to contain a mutex as well
|
|
|
|
|
as an integer counter. */
|
2001-02-12 10:58:18 +01:00
|
|
|
|
guard_type = long_long_integer_type_node;
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard = build_decl (VAR_DECL, sname, guard_type);
|
2001-01-11 14:34:00 +01:00
|
|
|
|
|
|
|
|
|
/* The guard should have the same linkage as what it guards. */
|
|
|
|
|
TREE_PUBLIC (guard) = TREE_PUBLIC (decl);
|
|
|
|
|
TREE_STATIC (guard) = TREE_STATIC (decl);
|
|
|
|
|
DECL_COMMON (guard) = DECL_COMMON (decl);
|
|
|
|
|
DECL_ONE_ONLY (guard) = DECL_ONE_ONLY (decl);
|
|
|
|
|
if (TREE_PUBLIC (decl))
|
|
|
|
|
DECL_WEAK (guard) = DECL_WEAK (decl);
|
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
DECL_ARTIFICIAL (guard) = 1;
|
|
|
|
|
TREE_USED (guard) = 1;
|
|
|
|
|
pushdecl_top_level (guard);
|
|
|
|
|
cp_finish_decl (guard, NULL_TREE, NULL_TREE, 0);
|
|
|
|
|
}
|
|
|
|
|
return guard;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return those bits of the GUARD variable that should be set when the
|
|
|
|
|
guarded entity is actually initialized. */
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
get_guard_bits (guard)
|
|
|
|
|
tree guard;
|
|
|
|
|
{
|
2001-07-21 02:03:21 +02:00
|
|
|
|
/* We only set the first byte of the guard, in order to leave room
|
|
|
|
|
for a mutex in the high-order bits. */
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard = build1 (ADDR_EXPR,
|
|
|
|
|
build_pointer_type (TREE_TYPE (guard)),
|
|
|
|
|
guard);
|
|
|
|
|
guard = build1 (NOP_EXPR,
|
|
|
|
|
build_pointer_type (char_type_node),
|
|
|
|
|
guard);
|
|
|
|
|
guard = build1 (INDIRECT_REF, char_type_node, guard);
|
|
|
|
|
|
|
|
|
|
return guard;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return an expression which determines whether or not the GUARD
|
|
|
|
|
variable has already been initialized. */
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
get_guard_cond (guard)
|
|
|
|
|
tree guard;
|
|
|
|
|
{
|
|
|
|
|
tree guard_value;
|
|
|
|
|
|
|
|
|
|
/* Check to see if the GUARD is zero. */
|
|
|
|
|
guard = get_guard_bits (guard);
|
|
|
|
|
guard_value = integer_zero_node;
|
|
|
|
|
if (!same_type_p (TREE_TYPE (guard_value), TREE_TYPE (guard)))
|
|
|
|
|
guard_value = convert (TREE_TYPE (guard), guard_value);
|
|
|
|
|
return cp_build_binary_op (EQ_EXPR, guard, guard_value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return an expression which sets the GUARD variable, indicating that
|
|
|
|
|
the variable being guarded has been initialized. */
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
set_guard (guard)
|
|
|
|
|
tree guard;
|
|
|
|
|
{
|
|
|
|
|
tree guard_init;
|
|
|
|
|
|
|
|
|
|
/* Set the GUARD to one. */
|
|
|
|
|
guard = get_guard_bits (guard);
|
|
|
|
|
guard_init = integer_one_node;
|
|
|
|
|
if (!same_type_p (TREE_TYPE (guard_init), TREE_TYPE (guard)))
|
|
|
|
|
guard_init = convert (TREE_TYPE (guard), guard_init);
|
|
|
|
|
return build_modify_expr (guard, NOP_EXPR, guard_init);
|
1996-04-24 20:30:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-20 04:46:16 +02:00
|
|
|
|
/* Start the process of running a particular set of global constructors
|
|
|
|
|
or destructors. Subroutine of do_[cd]tors. */
|
|
|
|
|
|
1999-09-24 03:29:29 +02:00
|
|
|
|
static tree
|
1998-08-13 19:29:30 +02:00
|
|
|
|
start_objects (method_type, initp)
|
|
|
|
|
int method_type, initp;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
{
|
|
|
|
|
tree fnname;
|
1999-09-24 03:29:29 +02:00
|
|
|
|
tree body;
|
1998-08-13 19:29:30 +02:00
|
|
|
|
char type[10];
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
|
|
|
|
/* Make ctor or dtor function. METHOD_TYPE may be 'I' or 'D'. */
|
|
|
|
|
|
1999-02-05 03:47:00 +01:00
|
|
|
|
if (initp != DEFAULT_INIT_PRIORITY)
|
1998-08-13 19:29:30 +02:00
|
|
|
|
{
|
1998-10-10 11:24:06 +02:00
|
|
|
|
char joiner;
|
|
|
|
|
|
|
|
|
|
#ifdef JOINER
|
|
|
|
|
joiner = JOINER;
|
|
|
|
|
#else
|
|
|
|
|
joiner = '_';
|
|
|
|
|
#endif
|
1998-08-13 19:29:30 +02:00
|
|
|
|
|
1998-10-10 11:24:06 +02:00
|
|
|
|
sprintf (type, "%c%c%.5u", method_type, joiner, initp);
|
1998-08-13 19:29:30 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
sprintf (type, "%c", method_type);
|
|
|
|
|
|
|
|
|
|
fnname = get_file_function_name_long (type);
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
|
|
|
|
start_function (void_list_node,
|
|
|
|
|
make_call_declarator (fnname, void_list_node, NULL_TREE,
|
|
|
|
|
NULL_TREE),
|
1999-09-24 03:29:29 +02:00
|
|
|
|
NULL_TREE, SF_DEFAULT);
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-02-21 20:58:22 +01:00
|
|
|
|
/* It can be a static function as long as collect2 does not have
|
|
|
|
|
to scan the object file to find its ctor/dtor routine. */
|
2001-08-10 00:33:35 +02:00
|
|
|
|
TREE_PUBLIC (current_function_decl) = ! targetm.have_ctors_dtors;
|
1999-02-21 20:42:18 +01:00
|
|
|
|
|
1999-09-23 04:04:33 +02:00
|
|
|
|
/* Mark this declaration as used to avoid spurious warnings. */
|
|
|
|
|
TREE_USED (current_function_decl) = 1;
|
|
|
|
|
|
1999-10-01 02:43:27 +02:00
|
|
|
|
/* Mark this function as a global constructor or destructor. */
|
|
|
|
|
if (method_type == 'I')
|
|
|
|
|
DECL_GLOBAL_CTOR_P (current_function_decl) = 1;
|
|
|
|
|
else
|
|
|
|
|
DECL_GLOBAL_DTOR_P (current_function_decl) = 1;
|
2002-06-04 09:11:05 +02:00
|
|
|
|
DECL_LANG_SPECIFIC (current_function_decl)->decl_flags.u2sel = 1;
|
1999-10-01 02:43:27 +02:00
|
|
|
|
GLOBAL_INIT_PRIORITY (current_function_decl) = initp;
|
|
|
|
|
|
1999-09-24 03:29:29 +02:00
|
|
|
|
body = begin_compound_stmt (/*has_no_scope=*/0);
|
1999-05-05 13:50:03 +02:00
|
|
|
|
|
|
|
|
|
/* We cannot allow these functions to be elided, even if they do not
|
|
|
|
|
have external linkage. And, there's no point in deferring
|
|
|
|
|
copmilation of thes functions; they're all going to have to be
|
|
|
|
|
out anyhow. */
|
|
|
|
|
current_function_cannot_inline
|
|
|
|
|
= "static constructors and destructors cannot be inlined";
|
1999-09-24 03:29:29 +02:00
|
|
|
|
|
|
|
|
|
return body;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Finish the process of running a particular set of global constructors
|
|
|
|
|
or destructors. Subroutine of do_[cd]tors. */
|
|
|
|
|
|
|
|
|
|
static void
|
1999-09-24 03:29:29 +02:00
|
|
|
|
finish_objects (method_type, initp, body)
|
1998-08-13 19:29:30 +02:00
|
|
|
|
int method_type, initp;
|
1999-09-24 03:29:29 +02:00
|
|
|
|
tree body;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
{
|
1999-09-24 03:29:29 +02:00
|
|
|
|
tree fn;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
2000-08-30 12:20:22 +02:00
|
|
|
|
/* Finish up. */
|
|
|
|
|
finish_compound_stmt (/*has_no_scope=*/0, body);
|
2000-04-11 18:27:42 +02:00
|
|
|
|
fn = finish_function (0);
|
1999-09-24 03:29:29 +02:00
|
|
|
|
expand_body (fn);
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-09-29 10:06:21 +02:00
|
|
|
|
/* When only doing semantic analysis, and no RTL generation, we
|
|
|
|
|
can't call functions that directly emit assembly code; there is
|
|
|
|
|
no assembly file in which to put the code. */
|
|
|
|
|
if (flag_syntax_only)
|
|
|
|
|
return;
|
|
|
|
|
|
2001-08-10 00:33:35 +02:00
|
|
|
|
if (targetm.have_ctors_dtors)
|
|
|
|
|
{
|
|
|
|
|
rtx fnsym = XEXP (DECL_RTL (fn), 0);
|
|
|
|
|
if (method_type == 'I')
|
|
|
|
|
(* targetm.asm_out.constructor) (fnsym, initp);
|
|
|
|
|
else
|
|
|
|
|
(* targetm.asm_out.destructor) (fnsym, initp);
|
|
|
|
|
}
|
1998-05-20 04:46:16 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* The names of the parameters to the function created to handle
|
|
|
|
|
initializations and destructions for objects with static storage
|
|
|
|
|
duration. */
|
|
|
|
|
#define INITIALIZE_P_IDENTIFIER "__initialize_p"
|
|
|
|
|
#define PRIORITY_IDENTIFIER "__priority"
|
|
|
|
|
|
|
|
|
|
/* The name of the function we create to handle initializations and
|
|
|
|
|
destructions for objects with static storage duration. */
|
|
|
|
|
#define SSDF_IDENTIFIER "__static_initialization_and_destruction"
|
|
|
|
|
|
|
|
|
|
/* The declaration for the __INITIALIZE_P argument. */
|
2002-06-04 09:11:05 +02:00
|
|
|
|
static GTY(()) tree initialize_p_decl;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
|
|
|
|
/* The declaration for the __PRIORITY argument. */
|
2002-06-04 09:11:05 +02:00
|
|
|
|
static GTY(()) tree priority_decl;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
|
|
|
|
/* The declaration for the static storage duration function. */
|
2002-06-04 09:11:05 +02:00
|
|
|
|
static GTY(()) tree ssdf_decl;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
1999-04-30 18:14:58 +02:00
|
|
|
|
/* All the static storage duration functions created in this
|
|
|
|
|
translation unit. */
|
2002-06-04 09:11:05 +02:00
|
|
|
|
static GTY(()) varray_type ssdf_decls;
|
1999-04-30 18:14:58 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* A map from priority levels to information about that priority
|
|
|
|
|
level. There may be many such levels, so efficient lookup is
|
|
|
|
|
important. */
|
|
|
|
|
static splay_tree priority_info_map;
|
|
|
|
|
|
|
|
|
|
/* Begins the generation of the function that will handle all
|
|
|
|
|
initialization and destruction of objects with static storage
|
|
|
|
|
duration. The function generated takes two parameters of type
|
|
|
|
|
`int': __INITIALIZE_P and __PRIORITY. If __INITIALIZE_P is
|
|
|
|
|
non-zero, it performs initializations. Otherwise, it performs
|
|
|
|
|
destructions. It only performs those initializations or
|
|
|
|
|
destructions with the indicated __PRIORITY. The generated function
|
|
|
|
|
returns no value.
|
|
|
|
|
|
|
|
|
|
It is assumed that this function will only be called once per
|
|
|
|
|
translation unit. */
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
static tree
|
1999-04-23 01:13:12 +02:00
|
|
|
|
start_static_storage_duration_function ()
|
1998-05-20 04:46:16 +02:00
|
|
|
|
{
|
1999-04-30 18:14:58 +02:00
|
|
|
|
static unsigned ssdf_number;
|
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
tree parm_types;
|
|
|
|
|
tree type;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
tree body;
|
1999-04-30 18:14:58 +02:00
|
|
|
|
char id[sizeof (SSDF_IDENTIFIER) + 1 /* '\0' */ + 32];
|
|
|
|
|
|
|
|
|
|
/* Create the identifier for this function. It will be of the form
|
|
|
|
|
SSDF_IDENTIFIER_<number>. */
|
|
|
|
|
sprintf (id, "%s_%u", SSDF_IDENTIFIER, ssdf_number++);
|
|
|
|
|
if (ssdf_number == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Overflow occurred. That means there are at least 4 billion
|
|
|
|
|
initialization functions. */
|
|
|
|
|
sorry ("too many initialization functions required");
|
call.c, [...]: Change my_fancy_abort() to abort().
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort().
From-SVN: r49139
2002-01-23 15:26:07 +01:00
|
|
|
|
abort ();
|
1999-04-30 18:14:58 +02:00
|
|
|
|
}
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
|
|
|
|
/* Create the parameters. */
|
|
|
|
|
parm_types = void_list_node;
|
1999-09-09 08:17:13 +02:00
|
|
|
|
parm_types = tree_cons (NULL_TREE, integer_type_node, parm_types);
|
|
|
|
|
parm_types = tree_cons (NULL_TREE, integer_type_node, parm_types);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
type = build_function_type (void_type_node, parm_types);
|
|
|
|
|
|
|
|
|
|
/* Create the FUNCTION_DECL itself. */
|
|
|
|
|
ssdf_decl = build_lang_decl (FUNCTION_DECL,
|
1999-04-30 18:14:58 +02:00
|
|
|
|
get_identifier (id),
|
1999-04-23 01:13:12 +02:00
|
|
|
|
type);
|
|
|
|
|
TREE_PUBLIC (ssdf_decl) = 0;
|
|
|
|
|
DECL_ARTIFICIAL (ssdf_decl) = 1;
|
1999-04-30 18:14:58 +02:00
|
|
|
|
|
|
|
|
|
/* Put this function in the list of functions to be called from the
|
|
|
|
|
static constructors and destructors. */
|
|
|
|
|
if (!ssdf_decls)
|
|
|
|
|
{
|
|
|
|
|
VARRAY_TREE_INIT (ssdf_decls, 32, "ssdf_decls");
|
|
|
|
|
|
|
|
|
|
/* Take this opportunity to initialize the map from priority
|
|
|
|
|
numbers to information about that priority level. */
|
|
|
|
|
priority_info_map = splay_tree_new (splay_tree_compare_ints,
|
|
|
|
|
/*delete_key_fn=*/0,
|
|
|
|
|
/*delete_value_fn=*/
|
|
|
|
|
(splay_tree_delete_value_fn) &free);
|
|
|
|
|
|
|
|
|
|
/* We always need to generate functions for the
|
|
|
|
|
DEFAULT_INIT_PRIORITY so enter it now. That way when we walk
|
|
|
|
|
priorities later, we'll be sure to find the
|
|
|
|
|
DEFAULT_INIT_PRIORITY. */
|
|
|
|
|
get_priority_info (DEFAULT_INIT_PRIORITY);
|
|
|
|
|
}
|
|
|
|
|
|
1999-12-05 01:37:56 +01:00
|
|
|
|
VARRAY_PUSH_TREE (ssdf_decls, ssdf_decl);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
|
|
|
|
/* Create the argument list. */
|
|
|
|
|
initialize_p_decl = build_decl (PARM_DECL,
|
|
|
|
|
get_identifier (INITIALIZE_P_IDENTIFIER),
|
|
|
|
|
integer_type_node);
|
|
|
|
|
DECL_CONTEXT (initialize_p_decl) = ssdf_decl;
|
|
|
|
|
DECL_ARG_TYPE (initialize_p_decl) = integer_type_node;
|
|
|
|
|
TREE_USED (initialize_p_decl) = 1;
|
|
|
|
|
priority_decl = build_decl (PARM_DECL, get_identifier (PRIORITY_IDENTIFIER),
|
|
|
|
|
integer_type_node);
|
|
|
|
|
DECL_CONTEXT (priority_decl) = ssdf_decl;
|
|
|
|
|
DECL_ARG_TYPE (priority_decl) = integer_type_node;
|
|
|
|
|
TREE_USED (priority_decl) = 1;
|
|
|
|
|
|
|
|
|
|
TREE_CHAIN (initialize_p_decl) = priority_decl;
|
|
|
|
|
DECL_ARGUMENTS (ssdf_decl) = initialize_p_decl;
|
|
|
|
|
|
1999-10-06 08:18:18 +02:00
|
|
|
|
/* Put the function in the global scope. */
|
|
|
|
|
pushdecl (ssdf_decl);
|
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Start the function itself. This is equivalent to declarating the
|
|
|
|
|
function as:
|
|
|
|
|
|
1999-05-19 13:24:18 +02:00
|
|
|
|
static void __ssdf (int __initialize_p, init __priority_p);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
|
|
|
|
It is static because we only need to call this function from the
|
|
|
|
|
various constructor and destructor functions for this module. */
|
|
|
|
|
start_function (/*specs=*/NULL_TREE,
|
|
|
|
|
ssdf_decl,
|
|
|
|
|
/*attrs=*/NULL_TREE,
|
1999-09-30 17:48:19 +02:00
|
|
|
|
SF_PRE_PARSED);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
|
|
|
|
/* Set up the scope of the outermost block in the function. */
|
1999-09-30 17:48:19 +02:00
|
|
|
|
body = begin_compound_stmt (/*has_no_scope=*/0);
|
1998-08-13 19:29:30 +02:00
|
|
|
|
|
1999-04-30 18:14:58 +02:00
|
|
|
|
/* This function must not be deferred because we are depending on
|
|
|
|
|
its compilation to tell us what is TREE_SYMBOL_REFERENCED. */
|
|
|
|
|
current_function_cannot_inline
|
|
|
|
|
= "static storage duration functions cannot be inlined";
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
return body;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Finish the generation of the function which performs initialization
|
|
|
|
|
and destruction of objects with static storage duration. After
|
|
|
|
|
this point, no more such objects can be created. */
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
|
|
|
|
static void
|
1999-09-30 17:48:19 +02:00
|
|
|
|
finish_static_storage_duration_function (body)
|
|
|
|
|
tree body;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
{
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Close out the function. */
|
1999-09-30 17:48:19 +02:00
|
|
|
|
finish_compound_stmt (/*has_no_scope=*/0, body);
|
2000-04-11 18:27:42 +02:00
|
|
|
|
expand_body (finish_function (0));
|
1999-04-23 01:13:12 +02:00
|
|
|
|
}
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Return the information about the indicated PRIORITY level. If no
|
|
|
|
|
code to handle this level has yet been generated, generate the
|
|
|
|
|
appropriate prologue. */
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
static priority_info
|
|
|
|
|
get_priority_info (priority)
|
|
|
|
|
int priority;
|
|
|
|
|
{
|
|
|
|
|
priority_info pi;
|
|
|
|
|
splay_tree_node n;
|
|
|
|
|
|
|
|
|
|
n = splay_tree_lookup (priority_info_map,
|
|
|
|
|
(splay_tree_key) priority);
|
|
|
|
|
if (!n)
|
|
|
|
|
{
|
|
|
|
|
/* Create a new priority information structure, and insert it
|
|
|
|
|
into the map. */
|
|
|
|
|
pi = (priority_info) xmalloc (sizeof (struct priority_info_s));
|
1999-04-30 18:14:58 +02:00
|
|
|
|
pi->initializations_p = 0;
|
|
|
|
|
pi->destructions_p = 0;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
splay_tree_insert (priority_info_map,
|
|
|
|
|
(splay_tree_key) priority,
|
|
|
|
|
(splay_tree_value) pi);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
pi = (priority_info) n->value;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
return pi;
|
|
|
|
|
}
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* Set up to handle the initialization or destruction of DECL. If
|
|
|
|
|
INITP is non-zero, we are initializing the variable. Otherwise, we
|
|
|
|
|
are destroying it. */
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
start_static_initialization_or_destruction (decl, initp)
|
|
|
|
|
tree decl;
|
|
|
|
|
int initp;
|
|
|
|
|
{
|
2000-06-30 09:16:35 +02:00
|
|
|
|
tree guard_if_stmt = NULL_TREE;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
int priority;
|
|
|
|
|
tree cond;
|
2000-06-30 09:16:35 +02:00
|
|
|
|
tree guard;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
tree init_cond;
|
|
|
|
|
priority_info pi;
|
|
|
|
|
|
|
|
|
|
/* Figure out the priority for this declaration. */
|
|
|
|
|
priority = DECL_INIT_PRIORITY (decl);
|
|
|
|
|
if (!priority)
|
|
|
|
|
priority = DEFAULT_INIT_PRIORITY;
|
|
|
|
|
|
|
|
|
|
/* Remember that we had an initialization or finalization at this
|
|
|
|
|
priority. */
|
|
|
|
|
pi = get_priority_info (priority);
|
|
|
|
|
if (initp)
|
|
|
|
|
pi->initializations_p = 1;
|
|
|
|
|
else
|
|
|
|
|
pi->destructions_p = 1;
|
|
|
|
|
|
|
|
|
|
/* Trick the compiler into thinking we are at the file and line
|
|
|
|
|
where DECL was declared so that error-messages make sense, and so
|
|
|
|
|
that the debugger will show somewhat sensible file and line
|
|
|
|
|
information. */
|
|
|
|
|
input_filename = DECL_SOURCE_FILE (decl);
|
|
|
|
|
lineno = DECL_SOURCE_LINE (decl);
|
|
|
|
|
|
|
|
|
|
/* Because of:
|
|
|
|
|
|
|
|
|
|
[class.access.spec]
|
|
|
|
|
|
|
|
|
|
Access control for implicit calls to the constructors,
|
|
|
|
|
the conversion functions, or the destructor called to
|
|
|
|
|
create and destroy a static data member is performed as
|
|
|
|
|
if these calls appeared in the scope of the member's
|
|
|
|
|
class.
|
|
|
|
|
|
|
|
|
|
we pretend we are in a static member function of the class of
|
|
|
|
|
which the DECL is a member. */
|
|
|
|
|
if (member_p (decl))
|
|
|
|
|
{
|
Make DECL_CONTEXT mean the class in which a member function was declared, even for a virtual function.
Make DECL_CONTEXT mean the class in which a member function was
declared, even for a virtual function.
* cp-tree.h (DECL_CLASS_CONTEXT): Adjust.
(DECL_FRIEND_CONTEXT): New macro.
(DECL_REAL_CONTEXT): Remove.
(SET_DECL_FRIEND_CONTEXT): Likewise.
(DECL_VIRTUAL_CONTEXT): Adjust.
(DECL_CLASS_SCOPE_P): Use TYPE_P.
(add_friends): Remove.
(hack_decl_function_context): Likewise.
* call.c (build_new_function_call): Replace DECL_REAL_CONTEXT with
CP_DECL_CONTEXT.
(build_over_call): Fix indentation. Use DECL_CONTEXT
instead of DECL_CLASS_CONTEXT.
* class.c (dfs_build_vcall_offset_vtbl_entries): Likewise.
(add_method): Set DECL_VIRTUAL_CONTEXT, not DECL_CLASS_CONTEXT.
(strictly_overrides): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(build_vtbl_or_vbase_field): Don't set DECL_CLASS_CONTEXT.
(build_base_field): Likewise.
(finish_struct_1): Likewise.
(build_self_reference): Likewise.
* decl.c (push_class_binding): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(pushtag): Use decl_function_context, not
hack_decl_function_context.
(decls_match): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
(duplicate_decls): Use DECL_VIRTUAL_CONTEXT.
(pushdecl): Remove bogus code.
(start_decl): Use DECL_CONTEXT rather than DECL_CLASS_CONTEXT.
(cp_finish_decl): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
(grokfndecl): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
Use decl_function_context, nothack_decl_function_context.
(grokvardecl): Don't set DECL_CLASS_CONTEXT.
(grokdeclarator): Likewise. Use decl_function_context, not
hack_decl_function_context.
(copy_args_p): Document. Don't use DECL_CLASS_CONTEXT.
(start_function): Use DECL_FRIEND_CONTEXT, not
DECL_CLASS_CONTEXT. Use decl_function_context, not
hack_decl_function_context.
(finish_function): Use decl_function_context, not
hack_decl_function_context.
(maybe_retrofit_in_chrg): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
(grokclassfn): Set DECL_VIRTUAL_CONTEXT, not DECL_CONTEXT.
(finish_static_data_member_decl): Don't set DECL_CLASS_CONTEXT.
(grokfield): Likewise.
(finish_builtin_type): Likewise.
(finish_vtable_vardec): Use decl_function_context, not
hack_decl_function_context.
(import_export_decl): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(start_static_initialization_or_destruction): Likewise.
(finish_static_initialization_or_destruction): Likewise.
(mark_used): Adjust logic for deciding when to synthesize methods.
* dump.c (dequeue_and_dump): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
* error.c (dump_function_decl): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* friend.c (is_friend): Likewise.
(add_friends): Remove.
(do_friend): Use SET_DECL_FRIEND_CONTEXT.
* lex.c (begin_definition_of_inclass_inline): Use
decl_function_context, not hack_decl_function_context.
(process_next_inline): Likewise.
(do_identifier): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
* method.c (set_mangled_name_for_decl): Use DECL_CONTEXT, not
DECL_CLASSS_CONTEXT.
(hack_identifier): Likewise.
(synthesize_method): Use decl_function_context, not
hack_decl_function_context.
* pt.c (template_class_depth_real): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(is_member_template): Use decl_function_context, not
hack_decl_function_context. Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
(build_template_decl): Set DECL_VIRTUAL_CONTEXT, not
DECL_CLASS_CONTEXT.
(check_default_tmpl_args): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(push_template_decl_real): Likewise.
(instantiate_class_template): Don't call add_friends.
(tsubst_default_argument): Use DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(tsubst_decl): Set DECL_VIRTUAL_CONTEXT, not DECL_CLASS_CONTEXT.
Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(set_meangled_name_for_template_decl): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* repo.c (repo_inline_used): Likewise.
* search.c (current_scope): Adjust for new _CONTEXT macros.
(context_for_name_lookup): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(friend_accessible_p): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(lookup_fnfields_here):Likewise.
(check_final_overrider): Likewise.
(init_vbase_pointers): Likewise.
(virtual_context): Likewise.
* semantics.c (finish_member_declaration): Just set DECL_CONTEXT.
(expand_body): Use decl_function_context, not
hack_decl_function_context.
* tree.c (hack_decl_function_context): Remove.
* typeck.c (build_x_function_call): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* typeck2.c (error_not_base_type): Likewise.
From-SVN: r32018
2000-02-17 00:54:23 +01:00
|
|
|
|
DECL_CONTEXT (current_function_decl) = DECL_CONTEXT (decl);
|
1999-09-30 17:48:19 +02:00
|
|
|
|
DECL_STATIC_FUNCTION_P (current_function_decl) = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Conditionalize this initialization on being in the right priority
|
|
|
|
|
and being initializing/finalizing appropriately. */
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard_if_stmt = begin_if_stmt ();
|
2000-06-30 02:26:03 +02:00
|
|
|
|
cond = cp_build_binary_op (EQ_EXPR,
|
|
|
|
|
priority_decl,
|
|
|
|
|
build_int_2 (priority, 0));
|
1999-09-30 17:48:19 +02:00
|
|
|
|
init_cond = initp ? integer_one_node : integer_zero_node;
|
2000-06-30 02:26:03 +02:00
|
|
|
|
init_cond = cp_build_binary_op (EQ_EXPR,
|
|
|
|
|
initialize_p_decl,
|
|
|
|
|
init_cond);
|
|
|
|
|
cond = cp_build_binary_op (TRUTH_ANDIF_EXPR, cond, init_cond);
|
1999-09-30 17:48:19 +02:00
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
/* Assume we don't need a guard. */
|
|
|
|
|
guard = NULL_TREE;
|
|
|
|
|
/* We need a guard if this is an object with external linkage that
|
2000-06-04 23:12:27 +02:00
|
|
|
|
might be initialized in more than one place. (For example, a
|
|
|
|
|
static data member of a template, when the data member requires
|
|
|
|
|
construction.) */
|
1999-09-30 17:48:19 +02:00
|
|
|
|
if (TREE_PUBLIC (decl) && (DECL_COMMON (decl)
|
|
|
|
|
|| DECL_ONE_ONLY (decl)
|
|
|
|
|
|| DECL_WEAK (decl)))
|
|
|
|
|
{
|
2000-06-30 09:16:35 +02:00
|
|
|
|
tree guard_cond;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard = get_guard (decl);
|
1999-09-30 17:48:19 +02:00
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
/* When using __cxa_atexit, we just check the GUARD as we would
|
|
|
|
|
for a local static. */
|
|
|
|
|
if (flag_use_cxa_atexit)
|
|
|
|
|
{
|
|
|
|
|
/* When using __cxa_atexit, we never try to destroy
|
|
|
|
|
anything from a static destructor. */
|
|
|
|
|
my_friendly_assert (initp, 20000629);
|
|
|
|
|
guard_cond = get_guard_cond (guard);
|
|
|
|
|
}
|
2001-05-01 00:20:03 +02:00
|
|
|
|
/* If we don't have __cxa_atexit, then we will be running
|
|
|
|
|
destructors from .fini sections, or their equivalents. So,
|
|
|
|
|
we need to know how many times we've tried to initialize this
|
|
|
|
|
object. We do initializations only if the GUARD is zero,
|
|
|
|
|
i.e., if we are the first to initialize the variable. We do
|
|
|
|
|
destructions only if the GUARD is one, i.e., if we are the
|
|
|
|
|
last to destroy the variable. */
|
2000-06-30 09:16:35 +02:00
|
|
|
|
else if (initp)
|
|
|
|
|
guard_cond
|
2000-06-30 02:26:03 +02:00
|
|
|
|
= cp_build_binary_op (EQ_EXPR,
|
|
|
|
|
build_unary_op (PREINCREMENT_EXPR,
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard,
|
2000-06-30 02:26:03 +02:00
|
|
|
|
/*noconvert=*/1),
|
|
|
|
|
integer_one_node);
|
1999-09-30 17:48:19 +02:00
|
|
|
|
else
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard_cond
|
2000-06-30 02:26:03 +02:00
|
|
|
|
= cp_build_binary_op (EQ_EXPR,
|
|
|
|
|
build_unary_op (PREDECREMENT_EXPR,
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard,
|
2000-06-30 02:26:03 +02:00
|
|
|
|
/*noconvert=*/1),
|
|
|
|
|
integer_zero_node);
|
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
cond = cp_build_binary_op (TRUTH_ANDIF_EXPR, cond, guard_cond);
|
1999-09-30 17:48:19 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
finish_if_stmt_cond (cond, guard_if_stmt);
|
|
|
|
|
|
2001-05-01 00:20:03 +02:00
|
|
|
|
/* If we're using __cxa_atexit, we have not already set the GUARD,
|
|
|
|
|
so we must do so now. */
|
|
|
|
|
if (guard && initp && flag_use_cxa_atexit)
|
2000-06-30 09:16:35 +02:00
|
|
|
|
finish_expr_stmt (set_guard (guard));
|
1999-09-30 17:48:19 +02:00
|
|
|
|
|
2000-06-30 09:16:35 +02:00
|
|
|
|
return guard_if_stmt;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We've just finished generating code to do an initialization or
|
2000-06-30 09:16:35 +02:00
|
|
|
|
finalization. GUARD_IF_STMT is the if-statement we used to guard
|
1999-09-30 17:48:19 +02:00
|
|
|
|
the initialization. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-06-30 09:16:35 +02:00
|
|
|
|
finish_static_initialization_or_destruction (guard_if_stmt)
|
|
|
|
|
tree guard_if_stmt;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
{
|
2000-06-30 09:16:35 +02:00
|
|
|
|
finish_then_clause (guard_if_stmt);
|
1999-09-30 17:48:19 +02:00
|
|
|
|
finish_if_stmt ();
|
|
|
|
|
|
|
|
|
|
/* Now that we're done with DECL we don't need to pretend to be a
|
|
|
|
|
member of its class any longer. */
|
Make DECL_CONTEXT mean the class in which a member function was declared, even for a virtual function.
Make DECL_CONTEXT mean the class in which a member function was
declared, even for a virtual function.
* cp-tree.h (DECL_CLASS_CONTEXT): Adjust.
(DECL_FRIEND_CONTEXT): New macro.
(DECL_REAL_CONTEXT): Remove.
(SET_DECL_FRIEND_CONTEXT): Likewise.
(DECL_VIRTUAL_CONTEXT): Adjust.
(DECL_CLASS_SCOPE_P): Use TYPE_P.
(add_friends): Remove.
(hack_decl_function_context): Likewise.
* call.c (build_new_function_call): Replace DECL_REAL_CONTEXT with
CP_DECL_CONTEXT.
(build_over_call): Fix indentation. Use DECL_CONTEXT
instead of DECL_CLASS_CONTEXT.
* class.c (dfs_build_vcall_offset_vtbl_entries): Likewise.
(add_method): Set DECL_VIRTUAL_CONTEXT, not DECL_CLASS_CONTEXT.
(strictly_overrides): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(build_vtbl_or_vbase_field): Don't set DECL_CLASS_CONTEXT.
(build_base_field): Likewise.
(finish_struct_1): Likewise.
(build_self_reference): Likewise.
* decl.c (push_class_binding): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(pushtag): Use decl_function_context, not
hack_decl_function_context.
(decls_match): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
(duplicate_decls): Use DECL_VIRTUAL_CONTEXT.
(pushdecl): Remove bogus code.
(start_decl): Use DECL_CONTEXT rather than DECL_CLASS_CONTEXT.
(cp_finish_decl): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
(grokfndecl): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
Use decl_function_context, nothack_decl_function_context.
(grokvardecl): Don't set DECL_CLASS_CONTEXT.
(grokdeclarator): Likewise. Use decl_function_context, not
hack_decl_function_context.
(copy_args_p): Document. Don't use DECL_CLASS_CONTEXT.
(start_function): Use DECL_FRIEND_CONTEXT, not
DECL_CLASS_CONTEXT. Use decl_function_context, not
hack_decl_function_context.
(finish_function): Use decl_function_context, not
hack_decl_function_context.
(maybe_retrofit_in_chrg): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
(grokclassfn): Set DECL_VIRTUAL_CONTEXT, not DECL_CONTEXT.
(finish_static_data_member_decl): Don't set DECL_CLASS_CONTEXT.
(grokfield): Likewise.
(finish_builtin_type): Likewise.
(finish_vtable_vardec): Use decl_function_context, not
hack_decl_function_context.
(import_export_decl): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(start_static_initialization_or_destruction): Likewise.
(finish_static_initialization_or_destruction): Likewise.
(mark_used): Adjust logic for deciding when to synthesize methods.
* dump.c (dequeue_and_dump): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
* error.c (dump_function_decl): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* friend.c (is_friend): Likewise.
(add_friends): Remove.
(do_friend): Use SET_DECL_FRIEND_CONTEXT.
* lex.c (begin_definition_of_inclass_inline): Use
decl_function_context, not hack_decl_function_context.
(process_next_inline): Likewise.
(do_identifier): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
* method.c (set_mangled_name_for_decl): Use DECL_CONTEXT, not
DECL_CLASSS_CONTEXT.
(hack_identifier): Likewise.
(synthesize_method): Use decl_function_context, not
hack_decl_function_context.
* pt.c (template_class_depth_real): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(is_member_template): Use decl_function_context, not
hack_decl_function_context. Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
(build_template_decl): Set DECL_VIRTUAL_CONTEXT, not
DECL_CLASS_CONTEXT.
(check_default_tmpl_args): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(push_template_decl_real): Likewise.
(instantiate_class_template): Don't call add_friends.
(tsubst_default_argument): Use DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(tsubst_decl): Set DECL_VIRTUAL_CONTEXT, not DECL_CLASS_CONTEXT.
Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(set_meangled_name_for_template_decl): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* repo.c (repo_inline_used): Likewise.
* search.c (current_scope): Adjust for new _CONTEXT macros.
(context_for_name_lookup): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(friend_accessible_p): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(lookup_fnfields_here):Likewise.
(check_final_overrider): Likewise.
(init_vbase_pointers): Likewise.
(virtual_context): Likewise.
* semantics.c (finish_member_declaration): Just set DECL_CONTEXT.
(expand_body): Use decl_function_context, not
hack_decl_function_context.
* tree.c (hack_decl_function_context): Remove.
* typeck.c (build_x_function_call): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* typeck2.c (error_not_base_type): Likewise.
From-SVN: r32018
2000-02-17 00:54:23 +01:00
|
|
|
|
DECL_CONTEXT (current_function_decl) = NULL_TREE;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
DECL_STATIC_FUNCTION_P (current_function_decl) = 0;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Generate code to do the static initialization of DECL. The
|
|
|
|
|
initialization is INIT. If DECL may be initialized more than once
|
2000-06-30 09:16:35 +02:00
|
|
|
|
in different object files, GUARD is the guard variable to
|
1999-04-23 01:13:12 +02:00
|
|
|
|
check. PRIORITY is the priority for the initialization. */
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
static void
|
1999-09-30 17:48:19 +02:00
|
|
|
|
do_static_initialization (decl, init)
|
1999-04-23 01:13:12 +02:00
|
|
|
|
tree decl;
|
|
|
|
|
tree init;
|
|
|
|
|
{
|
1999-09-30 17:48:19 +02:00
|
|
|
|
tree expr;
|
2000-06-30 09:16:35 +02:00
|
|
|
|
tree guard_if_stmt;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* Set up for the initialization. */
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard_if_stmt
|
1999-09-30 17:48:19 +02:00
|
|
|
|
= start_static_initialization_or_destruction (decl,
|
|
|
|
|
/*initp=*/1);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* Do the initialization itself. */
|
1999-04-23 01:13:12 +02:00
|
|
|
|
if (IS_AGGR_TYPE (TREE_TYPE (decl))
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE)
|
1999-09-30 17:48:19 +02:00
|
|
|
|
expr = build_aggr_init (decl, init, 0);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
else
|
1999-09-30 17:48:19 +02:00
|
|
|
|
{
|
|
|
|
|
expr = build (INIT_EXPR, TREE_TYPE (decl), decl, init);
|
|
|
|
|
TREE_SIDE_EFFECTS (expr) = 1;
|
|
|
|
|
}
|
|
|
|
|
finish_expr_stmt (expr);
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
2000-01-23 19:40:20 +01:00
|
|
|
|
/* If we're using __cxa_atexit, register a a function that calls the
|
|
|
|
|
destructor for the object. */
|
|
|
|
|
if (flag_use_cxa_atexit)
|
|
|
|
|
register_dtor_fn (decl);
|
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* Finsh up. */
|
2000-06-30 09:16:35 +02:00
|
|
|
|
finish_static_initialization_or_destruction (guard_if_stmt);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
}
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Generate code to do the static destruction of DECL. If DECL may be
|
2000-06-30 09:16:35 +02:00
|
|
|
|
initialized more than once in different object files, GUARD is the
|
1999-04-23 01:13:12 +02:00
|
|
|
|
guard variable to check. PRIORITY is the priority for the
|
|
|
|
|
destruction. */
|
|
|
|
|
|
|
|
|
|
static void
|
1999-09-30 17:48:19 +02:00
|
|
|
|
do_static_destruction (decl)
|
1999-04-23 01:13:12 +02:00
|
|
|
|
tree decl;
|
|
|
|
|
{
|
2000-06-30 09:16:35 +02:00
|
|
|
|
tree guard_if_stmt;
|
1998-05-20 04:46:16 +02:00
|
|
|
|
|
2000-01-23 19:40:20 +01:00
|
|
|
|
/* If we're using __cxa_atexit, then destructors are registered
|
|
|
|
|
immediately after objects are initialized. */
|
|
|
|
|
my_friendly_assert (!flag_use_cxa_atexit, 20000121);
|
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* If we don't need a destructor, there's nothing to do. */
|
2000-03-03 03:27:15 +01:00
|
|
|
|
if (TYPE_HAS_TRIVIAL_DESTRUCTOR (TREE_TYPE (decl)))
|
1999-04-23 01:13:12 +02:00
|
|
|
|
return;
|
2000-01-23 19:40:20 +01:00
|
|
|
|
|
1999-08-26 00:07:18 +02:00
|
|
|
|
/* Actually do the destruction. */
|
2000-06-30 09:16:35 +02:00
|
|
|
|
guard_if_stmt = start_static_initialization_or_destruction (decl,
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/*initp=*/0);
|
|
|
|
|
finish_expr_stmt (build_cleanup (decl));
|
2000-06-30 09:16:35 +02:00
|
|
|
|
finish_static_initialization_or_destruction (guard_if_stmt);
|
1998-05-20 04:46:16 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* VARS is a list of variables with static storage duration which may
|
|
|
|
|
need initialization and/or finalization. Remove those variables
|
|
|
|
|
that don't really need to be initialized or finalized, and return
|
|
|
|
|
the resulting list. The order in which the variables appear in
|
|
|
|
|
VARS is in reverse order of the order in which they should actually
|
|
|
|
|
be initialized. The list we return is in the unreversed order;
|
|
|
|
|
i.e., the first variable should be initialized first. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
static tree
|
|
|
|
|
prune_vars_needing_no_initialization (vars)
|
|
|
|
|
tree vars;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
{
|
1999-09-30 17:48:19 +02:00
|
|
|
|
tree var;
|
|
|
|
|
tree result;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
for (var = vars, result = NULL_TREE;
|
|
|
|
|
var;
|
|
|
|
|
var = TREE_CHAIN (var))
|
|
|
|
|
{
|
|
|
|
|
tree decl = TREE_VALUE (var);
|
|
|
|
|
tree init = TREE_PURPOSE (var);
|
1994-05-06 11:27:46 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* Deal gracefully with error. */
|
|
|
|
|
if (decl == error_mark_node)
|
|
|
|
|
continue;
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* The only things that can be initialized are variables. */
|
|
|
|
|
my_friendly_assert (TREE_CODE (decl) == VAR_DECL, 19990420);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* If this object is not defined, we don't need to do anything
|
|
|
|
|
here. */
|
|
|
|
|
if (DECL_EXTERNAL (decl))
|
|
|
|
|
continue;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* Also, if the initializer already contains errors, we can bail
|
|
|
|
|
out now. */
|
|
|
|
|
if (init && TREE_CODE (init) == TREE_LIST
|
|
|
|
|
&& value_member (error_mark_node, init))
|
|
|
|
|
continue;
|
1995-01-31 23:18:02 +01:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* This variable is going to need initialization and/or
|
|
|
|
|
finalization, so we add it to the list. */
|
|
|
|
|
result = tree_cons (init, decl, result);
|
|
|
|
|
}
|
1998-05-23 04:18:33 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
return result;
|
|
|
|
|
}
|
1998-05-23 04:18:33 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
/* Make sure we have told the back end about all the variables in
|
|
|
|
|
VARS. */
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
static void
|
|
|
|
|
write_out_vars (vars)
|
|
|
|
|
tree vars;
|
|
|
|
|
{
|
|
|
|
|
tree v;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
for (v = vars; v; v = TREE_CHAIN (v))
|
|
|
|
|
if (! TREE_ASM_WRITTEN (TREE_VALUE (v)))
|
|
|
|
|
rest_of_decl_compilation (TREE_VALUE (v), 0, 1, 1);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
}
|
1996-03-23 00:11:55 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Generate a static constructor (if CONSTRUCTOR_P) or destructor
|
|
|
|
|
(otherwise) that will initialize all gobal objects with static
|
|
|
|
|
storage duration having the indicated PRIORITY. */
|
1996-08-13 17:39:22 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
static void
|
|
|
|
|
generate_ctor_or_dtor_function (constructor_p, priority)
|
|
|
|
|
int constructor_p;
|
|
|
|
|
int priority;
|
|
|
|
|
{
|
|
|
|
|
char function_key;
|
|
|
|
|
tree arguments;
|
1999-09-24 03:29:29 +02:00
|
|
|
|
tree body;
|
1999-04-30 18:14:58 +02:00
|
|
|
|
size_t i;
|
1996-08-13 17:39:22 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* We use `I' to indicate initialization and `D' to indicate
|
|
|
|
|
destruction. */
|
|
|
|
|
if (constructor_p)
|
|
|
|
|
function_key = 'I';
|
|
|
|
|
else
|
|
|
|
|
function_key = 'D';
|
1996-08-13 17:39:22 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Begin the function. */
|
1999-09-24 03:29:29 +02:00
|
|
|
|
body = start_objects (function_key, priority);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Call the static storage duration function with appropriate
|
|
|
|
|
arguments. */
|
1999-12-05 01:37:56 +01:00
|
|
|
|
for (i = 0; i < ssdf_decls->elements_used; ++i)
|
1999-04-30 18:14:58 +02:00
|
|
|
|
{
|
|
|
|
|
arguments = tree_cons (NULL_TREE, build_int_2 (priority, 0),
|
|
|
|
|
NULL_TREE);
|
|
|
|
|
arguments = tree_cons (NULL_TREE, build_int_2 (constructor_p, 0),
|
|
|
|
|
arguments);
|
1999-09-24 03:29:29 +02:00
|
|
|
|
finish_expr_stmt (build_function_call (VARRAY_TREE (ssdf_decls, i),
|
1999-04-30 18:14:58 +02:00
|
|
|
|
arguments));
|
|
|
|
|
}
|
1996-03-23 00:11:55 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* If we're generating code for the DEFAULT_INIT_PRIORITY, throw in
|
|
|
|
|
calls to any functions marked with attributes indicating that
|
|
|
|
|
they should be called at initialization- or destruction-time. */
|
|
|
|
|
if (priority == DEFAULT_INIT_PRIORITY)
|
|
|
|
|
{
|
|
|
|
|
tree fns;
|
|
|
|
|
|
|
|
|
|
for (fns = constructor_p ? static_ctors : static_dtors;
|
|
|
|
|
fns;
|
|
|
|
|
fns = TREE_CHAIN (fns))
|
1999-09-24 03:29:29 +02:00
|
|
|
|
finish_expr_stmt (build_function_call (TREE_VALUE (fns), NULL_TREE));
|
1999-04-23 01:13:12 +02:00
|
|
|
|
}
|
1995-03-23 01:44:31 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Close out the function. */
|
1999-09-24 03:29:29 +02:00
|
|
|
|
finish_objects (function_key, priority, body);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
}
|
1995-04-18 21:23:38 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Generate constructor and destructor functions for the priority
|
1999-04-30 18:14:58 +02:00
|
|
|
|
indicated by N. */
|
1995-04-18 21:23:38 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
static int
|
|
|
|
|
generate_ctor_and_dtor_functions_for_priority (n, data)
|
|
|
|
|
splay_tree_node n;
|
1999-04-30 18:14:58 +02:00
|
|
|
|
void *data ATTRIBUTE_UNUSED;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
{
|
|
|
|
|
int priority = (int) n->key;
|
|
|
|
|
priority_info pi = (priority_info) n->value;
|
|
|
|
|
|
|
|
|
|
/* Generate the functions themselves, but only if they are really
|
|
|
|
|
needed. */
|
1999-04-30 18:14:58 +02:00
|
|
|
|
if (pi->initializations_p
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|| (priority == DEFAULT_INIT_PRIORITY && static_ctors))
|
|
|
|
|
generate_ctor_or_dtor_function (/*constructor_p=*/1,
|
|
|
|
|
priority);
|
1999-04-30 18:14:58 +02:00
|
|
|
|
if (pi->destructions_p
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|| (priority == DEFAULT_INIT_PRIORITY && static_dtors))
|
|
|
|
|
generate_ctor_or_dtor_function (/*constructor_p=*/0,
|
|
|
|
|
priority);
|
|
|
|
|
|
|
|
|
|
/* Keep iterating. */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1998-08-13 19:29:30 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* This routine is called from the last rule in yyparse ().
|
|
|
|
|
Its job is to create all the code needed to initialize and
|
|
|
|
|
destroy the global aggregates. We do the destruction
|
|
|
|
|
first, since that way we only need to reverse the decls once. */
|
1995-04-18 21:23:38 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
void
|
|
|
|
|
finish_file ()
|
|
|
|
|
{
|
|
|
|
|
tree vars;
|
|
|
|
|
int reconsider;
|
|
|
|
|
size_t i;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
at_eof = 1;
|
1995-04-03 21:28:01 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Bad parse errors. Just forget about it. */
|
|
|
|
|
if (! global_bindings_p () || current_class_type || decl_namespace_list)
|
|
|
|
|
return;
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Otherwise, GDB can get confused, because in only knows
|
|
|
|
|
about source for LINENO-1 lines. */
|
|
|
|
|
lineno -= 1;
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
interface_unknown = 1;
|
|
|
|
|
interface_only = 0;
|
1999-03-23 03:33:34 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* We now have to write out all the stuff we put off writing out.
|
|
|
|
|
These include:
|
1996-12-18 03:46:25 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
o Template specializations that we have not yet instantiated,
|
|
|
|
|
but which are needed.
|
|
|
|
|
o Initialization and destruction for non-local objects with
|
|
|
|
|
static storage duration. (Local objects with static storage
|
|
|
|
|
duration are initialized when their scope is first entered,
|
|
|
|
|
and are cleaned up via atexit.)
|
|
|
|
|
o Virtual function tables.
|
1999-03-23 03:33:34 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
All of these may cause others to be needed. For example,
|
|
|
|
|
instantiating one function may cause another to be needed, and
|
|
|
|
|
generating the intiailzer for an object may cause templates to be
|
|
|
|
|
instantiated, etc., etc. */
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
Makefile.in (OBJS): Add timevar.o.
hangeLog:
* Makefile.in (OBJS): Add timevar.o.
(toplev.o): Depend on timevar.h.
(ggc-simple.o): Likewise.
(ggc-page.o): Likewise.
(timevar.o): New rule.
(timevar.h): New rule.
* timevar.h: New file.
* timevar.c: Likewise.
* timevar.def: Likewise.
* toplev.h (gc_time, parse_time, varconst_time): Remove.
* toplev.c: Use timevar_push and timevar_pop instead of TIMEVAR
throughout.
(TIMEVAR): Remove macro.
(gc_time, parse_time, varconst_time, integration_time, jump_time,
cse_time, gcse_time, loop_time, cse2_time, branch_prob_time,
flow_time, combine_time, regmove_time, sched_time,
local_alloc_time, global_alloc_time, flow2_time, peephole2_time,
sched2_time, dbr_sched_time, reorder_blocks_time,
rename_registers_time, shorten_branch_time, stack_reg_time,
to_ssa_time, from_ssa_time, final_time, symout_time, dump_time,
all_time): Remove.
(compile_file): Don't initialize time variables. Call
init_timevar and start TV_TOTAL timer. Call timevar_print instead
of many calls to print_time.
(rest_of_compilation): Add timing for reload_cse_regs.
(get_run_time): Removed to timevar.c.
(print_time): Likewise.
(get_run_time): Implement using TV_TOTAL time variable.
(print_time): Get total run time from get_run_time.
* ggc-page.c (ggc_collect): Push and pop TV_GC instead of
computing elapsed time explicitly.
* ggc-simple.c (ggc_collect): Likewise.
(gc_time): Remove declaration.
cp/ChangeLog:
* lex.c (my_get_run_time): Remove.
(init_filename_times): Use get_run_time instead of my_get_run_time.
(check_newline): Likewise.
(dump_time_statistics): Likewise.
* decl2.c (finish_file): Push and pop timevar TV_VARCONST instead
of computing elapsed time explicitly.
From-SVN: r33496
2000-04-28 02:59:40 +02:00
|
|
|
|
timevar_push (TV_VARCONST);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
2001-02-18 21:31:44 +01:00
|
|
|
|
emit_support_tinfos ();
|
2000-01-28 14:30:13 +01:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
reconsider = 0;
|
|
|
|
|
|
1999-04-30 00:39:31 +02:00
|
|
|
|
/* If there are templates that we've put off instantiating, do
|
|
|
|
|
them now. */
|
1999-04-23 01:13:12 +02:00
|
|
|
|
instantiate_pending_templates ();
|
|
|
|
|
|
extend.texi (C++ Signatures): Remove node.
* extend.texi (C++ Signatures): Remove node.
* invoke.texi: Remove discussion of -fhandle-signatures,
signature, sigof, __signature__, and __sigof__.
* Make-lang.in (CXX_SRCS): Remove sig.c.
* Makefile.in (CXX_OBJS): Remove sig.o.
(sig.o): Remove.
* cp-tree.h (CPTI_OPAQUE_TYPE): Remove.
(CPTI_SIGNATURE_TYPE): Likewise.
(CPTI_SIGTABLE_ENTRY_TYPE): Likewise.
(opaque_type_node): Likewise.
(signature_type_node): Likewise.
(sigtable_entry_type): Likewise.
(flag_handle_signatures): Likewise.
(lang_type): Remove is_signature, is_signature_pointer,
is_signature_reference, has_opaque_typedecls,
sigtables_has_been_generated. Adjust dummy. Remove signature,
signature_pointer_to, signature_reference_to.
(IS_SIGNATURE): Remove.
(SET_SIGNATURE): Remove.
(CLEAR_SIGNATURE): Remove.
(IS_SIGNATURE_POINTER): Remove.
(IS_SIGNATURE_REFERENCE): Remove.
(SIGNATURE_HAS_OPAQUE_TYPEDECLS): Remove.
(SIGTABLE_HAS_BEEN_GENERATED): Remove.
(CLASSTYPE_SIGNATURE): Remove.
(SIGNATURE_TYPE): Remove.
(SIGNATURE_METHOD_VEC): Remove.
(SIGNATURE_POINTER_TO): Remove.
(SIGNATURE_REFERENCE_TO): Remove.
(lang_decl_flags): Remove is_default_implementation. Rename
memfunc_pointer_to to saved_tree.
(IS_DEFAULT_IMPLEMENTATION): Remove.
(DECL_MEMFUNC_POINTER_TO): Remove.
(DECL_MEMFUNC_POINTING_TO): Remove.
(DECL_SAVED_TREE): Adjust definition.
(tag_types): Remove signature_type_node.
(SIGNATURE_FIELD_NAME): Remove.
(SIGNATURE_FIELD_NAME_FORMAT): Likewise.
(SIGNATURE_OPTR_NAME): Likewise.
(SIGNATURE_SPTR_NAME): Likewise.
(SIGNATURE_POINTER_NAME): Likewise.
(SIGNATURE_POINTER_NAME_FORMAT): Likewise.
(SIGNATURE_REFERENCE_NAME): Likewise.
(SIGNATURE_REFERNECE_NAME_FORMAT): Likewise.
(SIGTABLE_PTR_TYPE): Likewise.
(SIGTABLE_NAME_FORMAT): Likewise.
(SIGTABLE_NAME_FORMAT_LONG): Likewise.
(SIGTABLE_TAG_NAME): Likewise.
(SIGTABLE_VB_OFF_NAME): Likewise.
(SIGTABLE_VT_OFF_NAME): Likewise.
(finish_base_specifiers): Change prototype.
(build_signature_pointer_type): Remove.
(build_signature_reference_type): Remove.
(build_signature_pointer_constructor): Remove.
(build_signature_method_call): Remove.
(build_optr_ref): Likewise.
(append_signature_fields): Likewise.
(signature_error): Likewise.
* call.c (build_this): Remove signature support.
(build_over_call): Likewise.
(build_new_method_call): Likewise.
* class.c (add_implicitly_declared_members): Likewise.
(finish_struct_1): Likewise.
(finish_struct): Likewise.
* cvt.c (cp_convert_to_pointer): Likewise.
(convert_to_pointer_force): Likewise.
(ocp_convert): Likewise.
* decl.c (sigtable_decl_p): Remove.
(init_decl_processing): Remove support for signatures.
(cp_finish_decl): Likewise.
(grokdeclarator): Likewise.
(grokparms): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
(start_method): Likewise.
* decl2.c (finish_sigtable_vardecl): Remove.
(flag_handle_signatures): Remove.
(lang_f_options): Remove handle-signatures.
(grokfield): Remove support for signatures.
(grokbitfield): Likewise.
(finish_file): Likewise.
(reparse_absdcl_as_casts): Likewise.
* error.c (dump_type_real): Likewise.
(dump_function_decl): Likewise.
* friend.c (make_friend_class): Likewise.
* gxx.gperf: Remove __signature__, signature, __sigof__, sigof.
* hash.h: Regenerated.
* init.c (build_new_1): Remove support for signatures.
* lang-options.h: Remove -fhandle-signatures,
-fno-handle-signatures.
* lex.c (init_parse): Remove support for signatures.
(yyprint): Likewise.
* lex.h (rid): Remove RID_SIGNATURE.
* method.c (build_decl_overload_real): Remove support for
signatures.
(hack_identifier): Likewise.
* parse.y (base_class): Likewise.
(base_class.1): Likewise.
(access_specifier): Likewise.
* search.c (lookup_member): Likewise.
* semantics.c (finish_qualified_object_call_expr): Likewise.
(finish_template_type_parm): Likewise.
(begin_class_definition): Likewise.
(finish_base_specifier): Likewise.
* sig.c: Remove.
* tree.c (build_cplus_method_type): Remove support for signatures.
* typeck.c (require_complete_type): Likewise.
(c_sizeof): Likewise.
(c_alignof): Likewise.
(build_object_ref): Likewise.
(build_component_ref): Likewise.
(build_indirect_ref): Likewise.
(build_c_cast): Likewise.
(build_modify_expr): Likewise.
(convert_for_initialization): Likewise.
* typeck2.c (signature_error): Remove.
(store_init_value): Remove support for signatures.
(digest_init): Likewise.
(build_x_arrow): Likewise.
(build_functional_cast): Likewise.
* xref.c (GNU_xref_decl): Likewise.
From-SVN: r28677
1999-08-11 22:22:41 +02:00
|
|
|
|
/* Write out virtual tables as required. Note that writing out
|
|
|
|
|
the virtual table for a template class may cause the
|
|
|
|
|
instantiation of members of that class. */
|
1999-04-23 01:13:12 +02:00
|
|
|
|
if (walk_globals (vtable_decl_p,
|
|
|
|
|
finish_vtable_vardecl,
|
|
|
|
|
/*data=*/0))
|
|
|
|
|
reconsider = 1;
|
|
|
|
|
|
2000-01-28 14:30:13 +01:00
|
|
|
|
/* Write out needed type info variables. Writing out one variable
|
|
|
|
|
might cause others to be needed. */
|
2002-06-30 22:41:38 +02:00
|
|
|
|
if (walk_globals (unemitted_tinfo_decl_p, emit_tinfo_decl, /*data=*/0))
|
2000-01-28 14:30:13 +01:00
|
|
|
|
reconsider = 1;
|
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* The list of objects with static storage duration is built up
|
1999-09-30 17:48:19 +02:00
|
|
|
|
in reverse order. We clear STATIC_AGGREGATES so that any new
|
|
|
|
|
aggregates added during the initialization of these will be
|
|
|
|
|
initialized in the correct order when we next come around the
|
|
|
|
|
loop. */
|
|
|
|
|
vars = prune_vars_needing_no_initialization (static_aggregates);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
static_aggregates = NULL_TREE;
|
1999-05-19 13:24:18 +02:00
|
|
|
|
|
1999-09-30 17:48:19 +02:00
|
|
|
|
if (vars)
|
|
|
|
|
{
|
|
|
|
|
tree v;
|
|
|
|
|
|
|
|
|
|
/* We need to start a new initialization function each time
|
|
|
|
|
through the loop. That's because we need to know which
|
|
|
|
|
vtables have been referenced, and TREE_SYMBOL_REFERENCED
|
|
|
|
|
isn't computed until a function is finished, and written
|
|
|
|
|
out. That's a deficiency in the back-end. When this is
|
|
|
|
|
fixed, these initialization functions could all become
|
|
|
|
|
inline, with resulting performance improvements. */
|
|
|
|
|
tree ssdf_body = start_static_storage_duration_function ();
|
|
|
|
|
|
|
|
|
|
/* Make sure the back end knows about all the variables. */
|
|
|
|
|
write_out_vars (vars);
|
|
|
|
|
|
|
|
|
|
/* First generate code to do all the initializations. */
|
|
|
|
|
for (v = vars; v; v = TREE_CHAIN (v))
|
|
|
|
|
do_static_initialization (TREE_VALUE (v),
|
|
|
|
|
TREE_PURPOSE (v));
|
|
|
|
|
|
|
|
|
|
/* Then, generate code to do all the destructions. Do these
|
|
|
|
|
in reverse order so that the most recently constructed
|
2000-01-23 19:40:20 +01:00
|
|
|
|
variable is the first destroyed. If we're using
|
|
|
|
|
__cxa_atexit, then we don't need to do this; functions
|
2000-05-01 03:43:24 +02:00
|
|
|
|
were registered at initialization time to destroy the
|
2000-01-23 19:40:20 +01:00
|
|
|
|
local statics. */
|
|
|
|
|
if (!flag_use_cxa_atexit)
|
|
|
|
|
{
|
|
|
|
|
vars = nreverse (vars);
|
|
|
|
|
for (v = vars; v; v = TREE_CHAIN (v))
|
|
|
|
|
do_static_destruction (TREE_VALUE (v));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
vars = NULL_TREE;
|
1999-09-30 17:48:19 +02:00
|
|
|
|
|
|
|
|
|
/* Finish up the static storage duration function for this
|
|
|
|
|
round. */
|
|
|
|
|
finish_static_storage_duration_function (ssdf_body);
|
|
|
|
|
|
|
|
|
|
/* All those initializations and finalizations might cause
|
|
|
|
|
us to need more inline functions, more template
|
|
|
|
|
instantiations, etc. */
|
1999-04-23 01:13:12 +02:00
|
|
|
|
reconsider = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Go through the various inline functions, and see if any need
|
|
|
|
|
synthesizing. */
|
2000-04-06 18:30:45 +02:00
|
|
|
|
for (i = 0; i < deferred_fns_used; ++i)
|
1999-04-23 01:13:12 +02:00
|
|
|
|
{
|
2000-04-06 18:30:45 +02:00
|
|
|
|
tree decl = VARRAY_TREE (deferred_fns, i);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
import_export_decl (decl);
|
|
|
|
|
if (DECL_ARTIFICIAL (decl) && ! DECL_INITIAL (decl)
|
|
|
|
|
&& TREE_USED (decl)
|
|
|
|
|
&& (! DECL_REALLY_EXTERN (decl) || DECL_INLINE (decl)))
|
|
|
|
|
{
|
|
|
|
|
/* Even though we're already at the top-level, we push
|
|
|
|
|
there again. That way, when we pop back a few lines
|
|
|
|
|
hence, all of our state is restored. Otherwise,
|
|
|
|
|
finish_function doesn't clean things up, and we end
|
|
|
|
|
up with CURRENT_FUNCTION_DECL set. */
|
|
|
|
|
push_to_top_level ();
|
2001-02-12 10:58:18 +01:00
|
|
|
|
synthesize_method (decl);
|
1999-04-23 01:13:12 +02:00
|
|
|
|
pop_from_top_level ();
|
|
|
|
|
reconsider = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-30 18:14:58 +02:00
|
|
|
|
/* We lie to the back-end, pretending that some functions are
|
|
|
|
|
not defined when they really are. This keeps these functions
|
2000-05-03 03:35:11 +02:00
|
|
|
|
from being put out unnecessarily. But, we must stop lying
|
1999-04-30 18:14:58 +02:00
|
|
|
|
when the functions are referenced, or if they are not comdat
|
2002-04-17 19:17:55 +02:00
|
|
|
|
since they need to be put out now.
|
|
|
|
|
This is done in a separate for cycle, because if some deferred
|
|
|
|
|
function is contained in another deferred function later in
|
|
|
|
|
deferred_fns varray, rest_of_compilation would skip this
|
|
|
|
|
function and we really cannot expand the same function twice. */
|
2000-04-06 18:30:45 +02:00
|
|
|
|
for (i = 0; i < deferred_fns_used; ++i)
|
1999-04-23 18:58:01 +02:00
|
|
|
|
{
|
2000-04-06 18:30:45 +02:00
|
|
|
|
tree decl = VARRAY_TREE (deferred_fns, i);
|
1999-04-23 18:58:01 +02:00
|
|
|
|
|
|
|
|
|
if (DECL_NOT_REALLY_EXTERN (decl)
|
|
|
|
|
&& DECL_INITIAL (decl)
|
2000-01-07 08:06:59 +01:00
|
|
|
|
&& DECL_NEEDED_P (decl))
|
1999-04-23 18:58:01 +02:00
|
|
|
|
DECL_EXTERNAL (decl) = 0;
|
2002-04-17 19:17:55 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < deferred_fns_used; ++i)
|
|
|
|
|
{
|
|
|
|
|
tree decl = VARRAY_TREE (deferred_fns, i);
|
1999-11-27 19:01:48 +01:00
|
|
|
|
|
|
|
|
|
/* If we're going to need to write this function out, and
|
|
|
|
|
there's already a body for it, create RTL for it now.
|
|
|
|
|
(There might be no body if this is a method we haven't
|
|
|
|
|
gotten around to synthesizing yet.) */
|
|
|
|
|
if (!DECL_EXTERNAL (decl)
|
2000-01-07 08:06:59 +01:00
|
|
|
|
&& DECL_NEEDED_P (decl)
|
1999-11-27 19:01:48 +01:00
|
|
|
|
&& DECL_SAVED_TREE (decl)
|
|
|
|
|
&& !TREE_ASM_WRITTEN (decl))
|
|
|
|
|
{
|
|
|
|
|
int saved_not_really_extern;
|
|
|
|
|
|
|
|
|
|
/* When we call finish_function in expand_body, it will
|
|
|
|
|
try to reset DECL_NOT_REALLY_EXTERN so we save and
|
|
|
|
|
restore it here. */
|
1999-11-27 19:04:50 +01:00
|
|
|
|
saved_not_really_extern = DECL_NOT_REALLY_EXTERN (decl);
|
1999-11-27 19:01:48 +01:00
|
|
|
|
/* Generate RTL for this function now that we know we
|
|
|
|
|
need it. */
|
|
|
|
|
expand_body (decl);
|
|
|
|
|
/* Undo the damage done by finish_function. */
|
|
|
|
|
DECL_EXTERNAL (decl) = 0;
|
|
|
|
|
DECL_NOT_REALLY_EXTERN (decl) = saved_not_really_extern;
|
|
|
|
|
/* If we're compiling -fsyntax-only pretend that this
|
|
|
|
|
function has been written out so that we don't try to
|
|
|
|
|
expand it again. */
|
|
|
|
|
if (flag_syntax_only)
|
|
|
|
|
TREE_ASM_WRITTEN (decl) = 1;
|
|
|
|
|
reconsider = 1;
|
|
|
|
|
}
|
1999-04-23 18:58:01 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-04-06 18:30:45 +02:00
|
|
|
|
if (deferred_fns_used
|
|
|
|
|
&& wrapup_global_declarations (&VARRAY_TREE (deferred_fns, 0),
|
|
|
|
|
deferred_fns_used))
|
1999-04-23 18:58:01 +02:00
|
|
|
|
reconsider = 1;
|
|
|
|
|
if (walk_namespaces (wrapup_globals_for_namespace, /*data=*/0))
|
|
|
|
|
reconsider = 1;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
|
|
|
|
|
/* Static data members are just like namespace-scope globals. */
|
|
|
|
|
for (i = 0; i < pending_statics_used; ++i)
|
|
|
|
|
{
|
|
|
|
|
tree decl = VARRAY_TREE (pending_statics, i);
|
|
|
|
|
if (TREE_ASM_WRITTEN (decl))
|
|
|
|
|
continue;
|
|
|
|
|
import_export_decl (decl);
|
|
|
|
|
if (DECL_NOT_REALLY_EXTERN (decl) && ! DECL_IN_AGGR_P (decl))
|
|
|
|
|
DECL_EXTERNAL (decl) = 0;
|
|
|
|
|
}
|
1999-04-23 18:58:01 +02:00
|
|
|
|
if (pending_statics
|
|
|
|
|
&& wrapup_global_declarations (&VARRAY_TREE (pending_statics, 0),
|
|
|
|
|
pending_statics_used))
|
|
|
|
|
reconsider = 1;
|
1999-04-30 18:14:58 +02:00
|
|
|
|
}
|
1999-04-23 01:13:12 +02:00
|
|
|
|
while (reconsider);
|
1995-03-23 01:44:31 +01:00
|
|
|
|
|
1999-04-30 18:14:58 +02:00
|
|
|
|
/* We give C linkage to static constructors and destructors. */
|
|
|
|
|
push_lang_context (lang_name_c);
|
|
|
|
|
|
|
|
|
|
/* Generate initialization and destruction functions for all
|
|
|
|
|
priorities for which they are required. */
|
|
|
|
|
if (priority_info_map)
|
|
|
|
|
splay_tree_foreach (priority_info_map,
|
|
|
|
|
generate_ctor_and_dtor_functions_for_priority,
|
|
|
|
|
/*data=*/0);
|
|
|
|
|
|
|
|
|
|
/* We're done with the splay-tree now. */
|
|
|
|
|
if (priority_info_map)
|
|
|
|
|
splay_tree_delete (priority_info_map);
|
|
|
|
|
|
|
|
|
|
/* We're done with static constructors, so we can go back to "C++"
|
|
|
|
|
linkage now. */
|
|
|
|
|
pop_lang_context ();
|
|
|
|
|
|
|
|
|
|
/* Now delete from the chain of variables all virtual function tables.
|
|
|
|
|
We output them all ourselves, because each will be treated
|
1999-09-29 10:06:21 +02:00
|
|
|
|
specially. We don't do this if we're just doing semantic
|
|
|
|
|
analysis, and not code-generation. */
|
|
|
|
|
if (!flag_syntax_only)
|
|
|
|
|
walk_globals (vtable_decl_p, prune_vtable_vardecl, /*data=*/0);
|
1999-04-30 18:14:58 +02:00
|
|
|
|
|
1999-04-23 01:13:12 +02:00
|
|
|
|
/* Now, issue warnings about static, but not defined, functions,
|
1999-09-16 19:48:20 +02:00
|
|
|
|
etc., and emit debugging information. */
|
1999-04-23 01:13:12 +02:00
|
|
|
|
walk_namespaces (wrapup_globals_for_namespace, /*data=*/&reconsider);
|
1999-09-16 19:48:20 +02:00
|
|
|
|
if (pending_statics)
|
|
|
|
|
check_global_declarations (&VARRAY_TREE (pending_statics, 0),
|
|
|
|
|
pending_statics_used);
|
1995-03-16 00:03:59 +01:00
|
|
|
|
|
1995-04-03 21:28:01 +02:00
|
|
|
|
finish_repo ();
|
|
|
|
|
|
1999-08-03 03:37:47 +02:00
|
|
|
|
/* The entire file is now complete. If requested, dump everything
|
1999-09-10 12:19:47 +02:00
|
|
|
|
to a file. */
|
c-common.h (flag_dump_translation_unit): Remove.
* c-common.h (flag_dump_translation_unit): Remove.
(enum tree_dump_index): Define.
(TDF_ADDRESS, TDF_SLIM): New #defines.
(dump_node_to_file): Remove.
(dump_node): Make extern. Add flags.
(dump_flag, dump_enabled_p, dump_begin, dump_end,
dump_switch_p): Prototype.
* c-common.c (flag_dump_translation_unit): Remove.
* c-decl.c (c_decode_option): Remove -fdump-translation-unit
logic. Use dump_switch_p.
* c-dump.h (struct dump_info): Add node and user fields.
(dump_pointer): Declare.
* c-dump.c (dump_node): Make extern. Add flags.
(SOL_COLUMN, EOL_COLUMN, COLUMN_ALIGNMENT): New #defines.
(dump_new_line, dump_maybe_newline): Use them.
(dump_pointer): New function.
(dequeue_and_dump): Check TDF_SLIM before dumping a _DECL's
chain or function's body. Dump address, if TDF_ADDRESS set.
(dump_flag): Define.
(dump_node_to_file): Remove.
(struct dump_file_info): New struct.
(dump_files): New array.
(dump_begin, dump_end, dump_enabled_p, dump_switch_p): Define.
* c-lang.c (finish_file): Adjust dumping.
* toplev.h (dump_base_name): Make extern.
* invoke.texi: Document new flags.
cp:
* class.c (maybe_indent_hierarchy): New function.
(dump_class_hierarchy_r): Add flags. Dump extra binfo
information, if enabled. Use maybe_indent_hierarchy. Adjust
output format.
(dump_class_hierarchy): Adjust prototype. Adjust output format.
(dump_array, dump_vtable, dump_vtt): New functions.
(finish_struct_1): Adjust hierarchy dumping.
(initialize_vtable): Call dump_vtable.
(build_vtt): Call dump_vtt.
(build_ctor_vtbl_group): Call dump_vtable.
* decl2.c (flag_dump_class_layout): Remove.
(cxx_decode_option): Remove dump translation unit
and dump class hierarchy check. Call dump_switch_p.
(finish_file): Adjust dumping.
(dump.c): Only dump base classes if not TDF_SLIM.
Only dump namespace members if not TDF_SLIM.
* optimize.c (dump_function): New function.
(optimize_function): Call dump_function.
* semantics.c (expand_body): Use dump_enabled_p.
From-SVN: r42896
2001-06-05 10:03:45 +02:00
|
|
|
|
{
|
|
|
|
|
int flags;
|
|
|
|
|
FILE *stream = dump_begin (TDI_all, &flags);
|
|
|
|
|
|
|
|
|
|
if (stream)
|
|
|
|
|
{
|
|
|
|
|
dump_node (global_namespace, flags & ~TDF_SLIM, stream);
|
|
|
|
|
dump_end (TDI_all, stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Makefile.in (OBJS): Add timevar.o.
hangeLog:
* Makefile.in (OBJS): Add timevar.o.
(toplev.o): Depend on timevar.h.
(ggc-simple.o): Likewise.
(ggc-page.o): Likewise.
(timevar.o): New rule.
(timevar.h): New rule.
* timevar.h: New file.
* timevar.c: Likewise.
* timevar.def: Likewise.
* toplev.h (gc_time, parse_time, varconst_time): Remove.
* toplev.c: Use timevar_push and timevar_pop instead of TIMEVAR
throughout.
(TIMEVAR): Remove macro.
(gc_time, parse_time, varconst_time, integration_time, jump_time,
cse_time, gcse_time, loop_time, cse2_time, branch_prob_time,
flow_time, combine_time, regmove_time, sched_time,
local_alloc_time, global_alloc_time, flow2_time, peephole2_time,
sched2_time, dbr_sched_time, reorder_blocks_time,
rename_registers_time, shorten_branch_time, stack_reg_time,
to_ssa_time, from_ssa_time, final_time, symout_time, dump_time,
all_time): Remove.
(compile_file): Don't initialize time variables. Call
init_timevar and start TV_TOTAL timer. Call timevar_print instead
of many calls to print_time.
(rest_of_compilation): Add timing for reload_cse_regs.
(get_run_time): Removed to timevar.c.
(print_time): Likewise.
(get_run_time): Implement using TV_TOTAL time variable.
(print_time): Get total run time from get_run_time.
* ggc-page.c (ggc_collect): Push and pop TV_GC instead of
computing elapsed time explicitly.
* ggc-simple.c (ggc_collect): Likewise.
(gc_time): Remove declaration.
cp/ChangeLog:
* lex.c (my_get_run_time): Remove.
(init_filename_times): Use get_run_time instead of my_get_run_time.
(check_newline): Likewise.
(dump_time_statistics): Likewise.
* decl2.c (finish_file): Push and pop timevar TV_VARCONST instead
of computing elapsed time explicitly.
From-SVN: r33496
2000-04-28 02:59:40 +02:00
|
|
|
|
timevar_pop (TV_VARCONST);
|
1994-02-24 02:02:37 +01:00
|
|
|
|
|
|
|
|
|
if (flag_detailed_statistics)
|
1997-10-06 18:37:44 +02:00
|
|
|
|
{
|
|
|
|
|
dump_tree_statistics ();
|
|
|
|
|
dump_time_statistics ();
|
|
|
|
|
}
|
1994-02-24 02:02:37 +01:00
|
|
|
|
}
|
1994-03-24 00:33:53 +01:00
|
|
|
|
|
|
|
|
|
/* This is something of the form 'A()()()()()+1' that has turned out to be an
|
|
|
|
|
expr. Since it was parsed like a type, we need to wade through and fix
|
|
|
|
|
that. Unfortunately, since operator() is left-associative, we can't use
|
|
|
|
|
tail recursion. In the above example, TYPE is `A', and DECL is
|
|
|
|
|
`()()()()()'.
|
|
|
|
|
|
|
|
|
|
Maybe this shouldn't be recursive, but how often will it actually be
|
|
|
|
|
used? (jason) */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-03-24 00:33:53 +01:00
|
|
|
|
tree
|
|
|
|
|
reparse_absdcl_as_expr (type, decl)
|
|
|
|
|
tree type, decl;
|
|
|
|
|
{
|
|
|
|
|
/* do build_functional_cast (type, NULL_TREE) at bottom */
|
|
|
|
|
if (TREE_OPERAND (decl, 0) == NULL_TREE)
|
|
|
|
|
return build_functional_cast (type, NULL_TREE);
|
|
|
|
|
|
|
|
|
|
/* recurse */
|
1998-12-14 16:35:40 +01:00
|
|
|
|
decl = reparse_absdcl_as_expr (type, TREE_OPERAND (decl, 0));
|
1994-03-24 00:33:53 +01:00
|
|
|
|
|
1996-05-16 20:43:00 +02:00
|
|
|
|
decl = build_x_function_call (decl, NULL_TREE, current_class_ref);
|
1994-03-24 00:33:53 +01:00
|
|
|
|
|
1999-02-27 00:37:04 +01:00
|
|
|
|
if (TREE_CODE (decl) == CALL_EXPR
|
|
|
|
|
&& (! TREE_TYPE (decl)
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (decl)) != VOID_TYPE))
|
1994-03-24 00:33:53 +01:00
|
|
|
|
decl = require_complete_type (decl);
|
|
|
|
|
|
|
|
|
|
return decl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is something of the form `int ((int)(int)(int)1)' that has turned
|
|
|
|
|
out to be an expr. Since it was parsed like a type, we need to wade
|
|
|
|
|
through and fix that. Since casts are right-associative, we are
|
|
|
|
|
reversing the order, so we don't have to recurse.
|
|
|
|
|
|
|
|
|
|
In the above example, DECL is the `(int)(int)(int)', and EXPR is the
|
|
|
|
|
`1'. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-03-24 00:33:53 +01:00
|
|
|
|
tree
|
|
|
|
|
reparse_absdcl_as_casts (decl, expr)
|
|
|
|
|
tree decl, expr;
|
|
|
|
|
{
|
|
|
|
|
tree type;
|
2002-01-02 14:59:10 +01:00
|
|
|
|
int non_void_p = 0;
|
1994-03-24 00:33:53 +01:00
|
|
|
|
|
1996-05-16 20:43:00 +02:00
|
|
|
|
if (TREE_CODE (expr) == CONSTRUCTOR
|
|
|
|
|
&& TREE_TYPE (expr) == 0)
|
1994-03-24 00:33:53 +01:00
|
|
|
|
{
|
1999-08-17 09:20:23 +02:00
|
|
|
|
type = groktypename (TREE_VALUE (CALL_DECLARATOR_PARMS (decl)));
|
1994-03-24 00:33:53 +01:00
|
|
|
|
decl = TREE_OPERAND (decl, 0);
|
|
|
|
|
|
2002-01-02 12:29:15 +01:00
|
|
|
|
if (processing_template_decl)
|
2002-01-29 10:52:51 +01:00
|
|
|
|
TREE_TYPE (expr) = type;
|
2002-01-02 12:29:15 +01:00
|
|
|
|
else
|
1994-03-24 00:33:53 +01:00
|
|
|
|
{
|
2002-01-02 12:29:15 +01:00
|
|
|
|
expr = digest_init (type, expr, (tree *) 0);
|
|
|
|
|
if (TREE_CODE (type) == ARRAY_TYPE && !COMPLETE_TYPE_P (type))
|
|
|
|
|
{
|
|
|
|
|
int failure = complete_array_type (type, expr, 1);
|
|
|
|
|
my_friendly_assert (!failure, 78);
|
|
|
|
|
}
|
1994-03-24 00:33:53 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (decl)
|
|
|
|
|
{
|
1999-08-17 09:20:23 +02:00
|
|
|
|
type = groktypename (TREE_VALUE (CALL_DECLARATOR_PARMS (decl)));
|
1994-03-24 00:33:53 +01:00
|
|
|
|
decl = TREE_OPERAND (decl, 0);
|
2002-01-02 14:59:10 +01:00
|
|
|
|
if (!VOID_TYPE_P (type))
|
|
|
|
|
non_void_p = 1;
|
1996-12-18 02:44:21 +01:00
|
|
|
|
expr = build_c_cast (type, expr);
|
1994-03-24 00:33:53 +01:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-09 14:44:37 +02:00
|
|
|
|
if (warn_old_style_cast && ! in_system_header
|
2002-01-02 14:59:10 +01:00
|
|
|
|
&& non_void_p && current_lang_name != lang_name_c)
|
1998-09-07 16:25:35 +02:00
|
|
|
|
warning ("use of old-style cast");
|
1997-09-29 21:05:04 +02:00
|
|
|
|
|
1994-03-24 00:33:53 +01:00
|
|
|
|
return expr;
|
|
|
|
|
}
|
|
|
|
|
|
1996-07-11 03:13:25 +02:00
|
|
|
|
/* Given plain tree nodes for an expression, build up the full semantics. */
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
build_expr_from_tree (t)
|
|
|
|
|
tree t;
|
1994-03-24 00:33:53 +01:00
|
|
|
|
{
|
1996-02-28 23:01:56 +01:00
|
|
|
|
if (t == NULL_TREE || t == error_mark_node)
|
|
|
|
|
return t;
|
|
|
|
|
|
|
|
|
|
switch (TREE_CODE (t))
|
1994-03-24 00:33:53 +01:00
|
|
|
|
{
|
|
|
|
|
case IDENTIFIER_NODE:
|
1998-07-12 18:55:29 +02:00
|
|
|
|
return do_identifier (t, 0, NULL_TREE);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
|
|
|
|
case LOOKUP_EXPR:
|
|
|
|
|
if (LOOKUP_EXPR_GLOBAL (t))
|
2002-06-23 22:10:09 +02:00
|
|
|
|
{
|
|
|
|
|
tree token = TREE_OPERAND (t, 0);
|
|
|
|
|
return do_scoped_id (token, IDENTIFIER_GLOBAL_VALUE (token));
|
|
|
|
|
}
|
1996-02-28 23:01:56 +01:00
|
|
|
|
else
|
1998-07-12 18:55:29 +02:00
|
|
|
|
return do_identifier (TREE_OPERAND (t, 0), 0, NULL_TREE);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
1997-09-28 21:16:59 +02:00
|
|
|
|
case TEMPLATE_ID_EXPR:
|
1997-11-11 08:09:58 +01:00
|
|
|
|
return (lookup_template_function
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1))));
|
1997-09-28 21:16:59 +02:00
|
|
|
|
|
1994-03-24 00:33:53 +01:00
|
|
|
|
case INDIRECT_REF:
|
|
|
|
|
return build_x_indirect_ref
|
1996-02-28 23:01:56 +01:00
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)), "unary *");
|
|
|
|
|
|
|
|
|
|
case CAST_EXPR:
|
|
|
|
|
return build_functional_cast
|
|
|
|
|
(TREE_TYPE (t), build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
|
|
|
|
case REINTERPRET_CAST_EXPR:
|
|
|
|
|
return build_reinterpret_cast
|
|
|
|
|
(TREE_TYPE (t), build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
1996-07-11 03:13:25 +02:00
|
|
|
|
case CONST_CAST_EXPR:
|
|
|
|
|
return build_const_cast
|
|
|
|
|
(TREE_TYPE (t), build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
|
|
|
|
case DYNAMIC_CAST_EXPR:
|
|
|
|
|
return build_dynamic_cast
|
|
|
|
|
(TREE_TYPE (t), build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
|
|
|
|
case STATIC_CAST_EXPR:
|
|
|
|
|
return build_static_cast
|
|
|
|
|
(TREE_TYPE (t), build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
1996-02-28 23:01:56 +01:00
|
|
|
|
case PREDECREMENT_EXPR:
|
|
|
|
|
case PREINCREMENT_EXPR:
|
|
|
|
|
case POSTDECREMENT_EXPR:
|
|
|
|
|
case POSTINCREMENT_EXPR:
|
|
|
|
|
case NEGATE_EXPR:
|
1994-03-24 00:33:53 +01:00
|
|
|
|
case BIT_NOT_EXPR:
|
1996-02-28 23:01:56 +01:00
|
|
|
|
case ABS_EXPR:
|
|
|
|
|
case TRUTH_NOT_EXPR:
|
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
case CONVERT_EXPR: /* Unary + */
|
1999-11-03 07:52:46 +01:00
|
|
|
|
case REALPART_EXPR:
|
|
|
|
|
case IMAGPART_EXPR:
|
1996-03-21 20:46:11 +01:00
|
|
|
|
if (TREE_TYPE (t))
|
|
|
|
|
return t;
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return build_x_unary_op (TREE_CODE (t),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
|
|
|
|
case PLUS_EXPR:
|
|
|
|
|
case MINUS_EXPR:
|
|
|
|
|
case MULT_EXPR:
|
|
|
|
|
case TRUNC_DIV_EXPR:
|
|
|
|
|
case CEIL_DIV_EXPR:
|
|
|
|
|
case FLOOR_DIV_EXPR:
|
|
|
|
|
case ROUND_DIV_EXPR:
|
|
|
|
|
case EXACT_DIV_EXPR:
|
|
|
|
|
case BIT_AND_EXPR:
|
|
|
|
|
case BIT_ANDTC_EXPR:
|
|
|
|
|
case BIT_IOR_EXPR:
|
|
|
|
|
case BIT_XOR_EXPR:
|
|
|
|
|
case TRUNC_MOD_EXPR:
|
|
|
|
|
case FLOOR_MOD_EXPR:
|
|
|
|
|
case TRUTH_ANDIF_EXPR:
|
|
|
|
|
case TRUTH_ORIF_EXPR:
|
|
|
|
|
case TRUTH_AND_EXPR:
|
|
|
|
|
case TRUTH_OR_EXPR:
|
|
|
|
|
case RSHIFT_EXPR:
|
|
|
|
|
case LSHIFT_EXPR:
|
|
|
|
|
case RROTATE_EXPR:
|
|
|
|
|
case LROTATE_EXPR:
|
|
|
|
|
case EQ_EXPR:
|
|
|
|
|
case NE_EXPR:
|
|
|
|
|
case MAX_EXPR:
|
|
|
|
|
case MIN_EXPR:
|
|
|
|
|
case LE_EXPR:
|
|
|
|
|
case GE_EXPR:
|
|
|
|
|
case LT_EXPR:
|
|
|
|
|
case GT_EXPR:
|
|
|
|
|
case MEMBER_REF:
|
|
|
|
|
return build_x_binary_op
|
|
|
|
|
(TREE_CODE (t),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)));
|
|
|
|
|
|
|
|
|
|
case DOTSTAR_EXPR:
|
|
|
|
|
return build_m_component_ref
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)));
|
|
|
|
|
|
1994-04-15 03:44:15 +02:00
|
|
|
|
case SCOPE_REF:
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return build_offset_ref (TREE_OPERAND (t, 0), TREE_OPERAND (t, 1));
|
|
|
|
|
|
1994-04-15 03:44:15 +02:00
|
|
|
|
case ARRAY_REF:
|
1996-02-28 23:01:56 +01:00
|
|
|
|
if (TREE_OPERAND (t, 0) == NULL_TREE)
|
|
|
|
|
/* new-type-id */
|
tree.c, tree.h (build_parse_node): Remove; was identical to build_nt.
* tree.c, tree.h (build_parse_node): Remove; was identical to
build_nt.
* c-lang.c (start_cdtor), objc/objc-act.c
(build_module_descriptor): Use build_nt instead of
build_parse_node.
cp:
* decl2.c (build_expr_from_tree), lex.c (make_pointer_declarator,
make_reference_declarator, make_call_declarator), method.c
(implicitly_declare_fn), parse.y (namespace_using_decl,
notype_unqualified_id, expr_or_declarator, new_type_id,
after_type_declarator, direct_after_type_declarator,
notype_declarator, complex_notype_declarator,
complex_direct_notype_declarator, qualified_id,
notype_qualified_id, overqualified_id, direct_new_declarator,
absdcl, direct_abstract_declarator, conversion_declarator), pt.c
(tsubst), semantics.c (begin_constructor_declarator): Use build_nt
instead of build_parse_node.
From-SVN: r39332
2001-01-29 19:57:24 +01:00
|
|
|
|
return build_nt (ARRAY_REF, NULL_TREE,
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)));
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return grok_array_decl (build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)));
|
|
|
|
|
|
|
|
|
|
case SIZEOF_EXPR:
|
1998-01-29 01:08:53 +01:00
|
|
|
|
case ALIGNOF_EXPR:
|
1996-02-28 23:01:56 +01:00
|
|
|
|
{
|
|
|
|
|
tree r = build_expr_from_tree (TREE_OPERAND (t, 0));
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
if (!TYPE_P (r))
|
2001-08-24 14:07:46 +02:00
|
|
|
|
return TREE_CODE (t) == SIZEOF_EXPR ? expr_sizeof (r) : c_alignof_expr (r);
|
|
|
|
|
else
|
2002-07-23 15:54:06 +02:00
|
|
|
|
return cxx_sizeof_or_alignof_type (r, TREE_CODE (t));
|
1996-02-28 23:01:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case MODOP_EXPR:
|
|
|
|
|
return build_x_modify_expr
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
TREE_CODE (TREE_OPERAND (t, 1)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 2)));
|
|
|
|
|
|
|
|
|
|
case ARROW_EXPR:
|
|
|
|
|
return build_x_arrow
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
|
|
|
|
case NEW_EXPR:
|
|
|
|
|
return build_new
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 2)),
|
|
|
|
|
NEW_EXPR_USE_GLOBAL (t));
|
|
|
|
|
|
|
|
|
|
case DELETE_EXPR:
|
|
|
|
|
return delete_sanity
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)),
|
|
|
|
|
DELETE_EXPR_USE_VEC (t), DELETE_EXPR_USE_GLOBAL (t));
|
|
|
|
|
|
|
|
|
|
case COMPOUND_EXPR:
|
|
|
|
|
if (TREE_OPERAND (t, 1) == NULL_TREE)
|
|
|
|
|
return build_x_compound_expr
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
else
|
call.c, [...]: Change my_fancy_abort() to abort().
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort().
From-SVN: r49139
2002-01-23 15:26:07 +01:00
|
|
|
|
abort ();
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
|
|
|
|
case METHOD_CALL_EXPR:
|
|
|
|
|
if (TREE_CODE (TREE_OPERAND (t, 0)) == SCOPE_REF)
|
|
|
|
|
{
|
|
|
|
|
tree ref = TREE_OPERAND (t, 0);
|
2000-08-11 11:28:01 +02:00
|
|
|
|
tree name = TREE_OPERAND (ref, 1);
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
|
|
|
|
|
name = build_nt (TEMPLATE_ID_EXPR,
|
|
|
|
|
TREE_OPERAND (name, 0),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (name, 1)));
|
|
|
|
|
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return build_scoped_method_call
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 1)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (ref, 0)),
|
2000-08-11 11:28:01 +02:00
|
|
|
|
name,
|
1996-02-28 23:01:56 +01:00
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 2)));
|
|
|
|
|
}
|
1998-12-14 16:35:40 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tree fn = TREE_OPERAND (t, 0);
|
1999-08-03 12:18:13 +02:00
|
|
|
|
|
1998-12-14 16:35:40 +01:00
|
|
|
|
/* We can get a TEMPLATE_ID_EXPR here on code like:
|
|
|
|
|
|
|
|
|
|
x->f<2>();
|
|
|
|
|
|
|
|
|
|
so we must resolve that. However, we can also get things
|
|
|
|
|
like a BIT_NOT_EXPR here, when referring to a destructor,
|
|
|
|
|
and things like that are not correctly resolved by
|
|
|
|
|
build_expr_from_tree. So, just use build_expr_from_tree
|
|
|
|
|
when we really need it. */
|
|
|
|
|
if (TREE_CODE (fn) == TEMPLATE_ID_EXPR)
|
1999-08-03 12:18:13 +02:00
|
|
|
|
fn = lookup_template_function
|
|
|
|
|
(TREE_OPERAND (fn, 0),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (fn, 1)));
|
1998-12-14 16:35:40 +01:00
|
|
|
|
|
|
|
|
|
return build_method_call
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 1)),
|
|
|
|
|
fn,
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 2)),
|
|
|
|
|
NULL_TREE, LOOKUP_NORMAL);
|
|
|
|
|
}
|
1996-02-28 23:01:56 +01:00
|
|
|
|
|
|
|
|
|
case CALL_EXPR:
|
|
|
|
|
if (TREE_CODE (TREE_OPERAND (t, 0)) == SCOPE_REF)
|
|
|
|
|
{
|
|
|
|
|
tree ref = TREE_OPERAND (t, 0);
|
2000-08-11 11:28:01 +02:00
|
|
|
|
tree name = TREE_OPERAND (ref, 1);
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
|
|
|
|
|
name = build_nt (TEMPLATE_ID_EXPR,
|
|
|
|
|
TREE_OPERAND (name, 0),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (name, 1)));
|
|
|
|
|
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return build_member_call
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (ref, 0)),
|
2000-08-11 11:28:01 +02:00
|
|
|
|
name,
|
1996-02-28 23:01:56 +01:00
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tree name = TREE_OPERAND (t, 0);
|
1998-07-12 18:55:29 +02:00
|
|
|
|
tree id;
|
|
|
|
|
tree args = build_expr_from_tree (TREE_OPERAND (t, 1));
|
|
|
|
|
if (args != NULL_TREE && TREE_CODE (name) == LOOKUP_EXPR
|
|
|
|
|
&& !LOOKUP_EXPR_GLOBAL (name)
|
|
|
|
|
&& TREE_CODE ((id = TREE_OPERAND (name, 0))) == IDENTIFIER_NODE
|
|
|
|
|
&& (!current_class_type
|
|
|
|
|
|| !lookup_member (current_class_type, id, 0, 0)))
|
|
|
|
|
{
|
|
|
|
|
/* Do Koenig lookup if there are no class members. */
|
|
|
|
|
name = do_identifier (id, 0, args);
|
|
|
|
|
}
|
|
|
|
|
else if (TREE_CODE (name) == TEMPLATE_ID_EXPR
|
1997-11-11 08:09:58 +01:00
|
|
|
|
|| ! really_overloaded_fn (name))
|
1996-02-28 23:01:56 +01:00
|
|
|
|
name = build_expr_from_tree (name);
|
1998-07-12 18:55:29 +02:00
|
|
|
|
return build_x_function_call (name, args, current_class_ref);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case COND_EXPR:
|
|
|
|
|
return build_x_conditional_expr
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 2)));
|
|
|
|
|
|
1999-08-19 10:06:17 +02:00
|
|
|
|
case PSEUDO_DTOR_EXPR:
|
|
|
|
|
return (finish_pseudo_destructor_call_expr
|
|
|
|
|
(build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 1)),
|
|
|
|
|
build_expr_from_tree (TREE_OPERAND (t, 2))));
|
|
|
|
|
|
1996-02-28 23:01:56 +01:00
|
|
|
|
case TREE_LIST:
|
|
|
|
|
{
|
|
|
|
|
tree purpose, value, chain;
|
|
|
|
|
|
|
|
|
|
if (t == void_list_node)
|
|
|
|
|
return t;
|
|
|
|
|
|
|
|
|
|
purpose = TREE_PURPOSE (t);
|
|
|
|
|
if (purpose)
|
|
|
|
|
purpose = build_expr_from_tree (purpose);
|
|
|
|
|
value = TREE_VALUE (t);
|
|
|
|
|
if (value)
|
|
|
|
|
value = build_expr_from_tree (value);
|
|
|
|
|
chain = TREE_CHAIN (t);
|
|
|
|
|
if (chain && chain != void_type_node)
|
|
|
|
|
chain = build_expr_from_tree (chain);
|
1999-09-09 08:17:13 +02:00
|
|
|
|
return tree_cons (purpose, value, chain);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case COMPONENT_REF:
|
1999-05-17 01:46:40 +02:00
|
|
|
|
{
|
|
|
|
|
tree object = build_expr_from_tree (TREE_OPERAND (t, 0));
|
|
|
|
|
tree field = TREE_OPERAND (t, 1);
|
|
|
|
|
|
|
|
|
|
/* We use a COMPONENT_REF to indicate things of the form `x.b'
|
|
|
|
|
and `x.A::b'. We must distinguish between those cases
|
|
|
|
|
here. */
|
|
|
|
|
if (TREE_CODE (field) == SCOPE_REF)
|
|
|
|
|
return build_object_ref (object,
|
|
|
|
|
TREE_OPERAND (field, 0),
|
|
|
|
|
TREE_OPERAND (field, 1));
|
|
|
|
|
else
|
2002-06-26 19:03:44 +02:00
|
|
|
|
return build_x_component_ref (object, field, NULL_TREE);
|
1999-05-17 01:46:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
1996-03-21 20:46:11 +01:00
|
|
|
|
case THROW_EXPR:
|
|
|
|
|
return build_throw (build_expr_from_tree (TREE_OPERAND (t, 0)));
|
|
|
|
|
|
1996-09-30 23:34:04 +02:00
|
|
|
|
case CONSTRUCTOR:
|
|
|
|
|
{
|
1998-04-17 03:57:57 +02:00
|
|
|
|
tree r;
|
2002-01-29 10:52:51 +01:00
|
|
|
|
tree elts;
|
|
|
|
|
tree type = TREE_TYPE (t);
|
|
|
|
|
bool purpose_p;
|
1998-04-17 03:57:57 +02:00
|
|
|
|
|
|
|
|
|
/* digest_init will do the wrong thing if we let it. */
|
2002-01-29 10:52:51 +01:00
|
|
|
|
if (type && TYPE_PTRMEMFUNC_P (type))
|
1998-04-17 03:57:57 +02:00
|
|
|
|
return t;
|
|
|
|
|
|
2002-01-29 10:52:51 +01:00
|
|
|
|
r = NULL_TREE;
|
|
|
|
|
/* We do not want to process the purpose of aggregate
|
|
|
|
|
initializers as they are identifier nodes which will be
|
|
|
|
|
looked up by digest_init. */
|
|
|
|
|
purpose_p = !(type && IS_AGGR_TYPE (type));
|
|
|
|
|
for (elts = CONSTRUCTOR_ELTS (t); elts; elts = TREE_CHAIN (elts))
|
|
|
|
|
{
|
|
|
|
|
tree purpose = TREE_PURPOSE (elts);
|
|
|
|
|
tree value = TREE_VALUE (elts);
|
|
|
|
|
|
|
|
|
|
if (purpose && purpose_p)
|
|
|
|
|
purpose = build_expr_from_tree (purpose);
|
|
|
|
|
value = build_expr_from_tree (value);
|
|
|
|
|
r = tree_cons (purpose, value, r);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
r = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (r));
|
1998-11-03 18:37:51 +01:00
|
|
|
|
TREE_HAS_CONSTRUCTOR (r) = TREE_HAS_CONSTRUCTOR (t);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
|
2002-01-29 10:52:51 +01:00
|
|
|
|
if (type)
|
|
|
|
|
return digest_init (type, r, 0);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case TYPEID_EXPR:
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
if (TYPE_P (TREE_OPERAND (t, 0)))
|
1997-02-12 21:23:55 +01:00
|
|
|
|
return get_typeid (TREE_OPERAND (t, 0));
|
2000-01-18 11:23:31 +01:00
|
|
|
|
return build_typeid (build_expr_from_tree (TREE_OPERAND (t, 0)));
|
1996-09-30 23:34:04 +02:00
|
|
|
|
|
1996-11-12 20:49:48 +01:00
|
|
|
|
case VAR_DECL:
|
|
|
|
|
return convert_from_reference (t);
|
|
|
|
|
|
1999-09-16 00:49:33 +02:00
|
|
|
|
case VA_ARG_EXPR:
|
|
|
|
|
return build_va_arg (build_expr_from_tree (TREE_OPERAND (t, 0)),
|
|
|
|
|
TREE_TYPE (t));
|
|
|
|
|
|
1994-04-08 08:08:43 +02:00
|
|
|
|
default:
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return t;
|
1994-03-24 00:33:53 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is something of the form `int (*a)++' that has turned out to be an
|
|
|
|
|
expr. It was only converted into parse nodes, so we need to go through
|
|
|
|
|
and build up the semantics. Most of the work is done by
|
1996-02-28 23:01:56 +01:00
|
|
|
|
build_expr_from_tree, above.
|
1994-03-24 00:33:53 +01:00
|
|
|
|
|
|
|
|
|
In the above example, TYPE is `int' and DECL is `*a'. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-03-24 00:33:53 +01:00
|
|
|
|
tree
|
|
|
|
|
reparse_decl_as_expr (type, decl)
|
|
|
|
|
tree type, decl;
|
|
|
|
|
{
|
1996-02-28 23:01:56 +01:00
|
|
|
|
decl = build_expr_from_tree (decl);
|
1995-02-18 23:06:40 +01:00
|
|
|
|
if (type)
|
2000-01-17 21:18:43 +01:00
|
|
|
|
return build_functional_cast (type, build_tree_list (NULL_TREE, decl));
|
1995-02-18 23:06:40 +01:00
|
|
|
|
else
|
|
|
|
|
return decl;
|
1994-03-24 00:33:53 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is something of the form `int (*a)' that has turned out to be a
|
|
|
|
|
decl. It was only converted into parse nodes, so we need to do the
|
1996-07-11 03:13:25 +02:00
|
|
|
|
checking that make_{pointer,reference}_declarator do. */
|
1994-03-24 00:33:53 +01:00
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
finish_decl_parsing (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
|
|
|
|
switch (TREE_CODE (decl))
|
|
|
|
|
{
|
|
|
|
|
case IDENTIFIER_NODE:
|
|
|
|
|
return decl;
|
|
|
|
|
case INDIRECT_REF:
|
|
|
|
|
return make_pointer_declarator
|
|
|
|
|
(NULL_TREE, finish_decl_parsing (TREE_OPERAND (decl, 0)));
|
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
return make_reference_declarator
|
|
|
|
|
(NULL_TREE, finish_decl_parsing (TREE_OPERAND (decl, 0)));
|
|
|
|
|
case BIT_NOT_EXPR:
|
|
|
|
|
TREE_OPERAND (decl, 0) = finish_decl_parsing (TREE_OPERAND (decl, 0));
|
|
|
|
|
return decl;
|
1994-04-08 08:08:43 +02:00
|
|
|
|
case SCOPE_REF:
|
1994-05-13 04:46:07 +02:00
|
|
|
|
push_nested_class (TREE_TYPE (TREE_OPERAND (decl, 0)), 3);
|
1994-04-08 08:08:43 +02:00
|
|
|
|
TREE_COMPLEXITY (decl) = current_class_depth;
|
|
|
|
|
return decl;
|
1994-04-15 03:44:15 +02:00
|
|
|
|
case ARRAY_REF:
|
|
|
|
|
TREE_OPERAND (decl, 0) = finish_decl_parsing (TREE_OPERAND (decl, 0));
|
|
|
|
|
return decl;
|
1998-10-18 05:10:53 +02:00
|
|
|
|
case TREE_LIST:
|
|
|
|
|
/* For attribute handling. */
|
|
|
|
|
TREE_VALUE (decl) = finish_decl_parsing (TREE_VALUE (decl));
|
|
|
|
|
return decl;
|
2000-07-17 23:35:46 +02:00
|
|
|
|
case TEMPLATE_ID_EXPR:
|
|
|
|
|
return decl;
|
1994-04-08 08:08:43 +02:00
|
|
|
|
default:
|
call.c, [...]: Change my_fancy_abort() to abort().
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort().
From-SVN: r49139
2002-01-23 15:26:07 +01:00
|
|
|
|
abort ();
|
1994-04-08 08:08:43 +02:00
|
|
|
|
return NULL_TREE;
|
1994-03-24 00:33:53 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
1994-05-19 22:19:03 +02:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Return 1 if root encloses child. */
|
|
|
|
|
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
static int
|
|
|
|
|
is_namespace_ancestor (root, child)
|
|
|
|
|
tree root, child;
|
|
|
|
|
{
|
|
|
|
|
if (root == child)
|
|
|
|
|
return 1;
|
|
|
|
|
if (root == global_namespace)
|
|
|
|
|
return 1;
|
|
|
|
|
if (child == global_namespace)
|
|
|
|
|
return 0;
|
cp-tree.h (CP_DECL_CONTEXT): New macro.
* cp-tree.h (CP_DECL_CONTEXT): New macro.
* decl2.c (is_namespace_ancestor, lookup_using_namespace): Use it.
* method.c (build_overload_nested_name): Likewise.
* sig.c (build_signature_pointer_or_reference_type): Don't set
DECL_CONTEXT.
Set DECL_CONTEXT for globals to NULL_TREE instead of global_namespace.
* cp-tree.h (FROB_CONTEXT): New macro.
(DECL_MAIN_P): ::main should have a DECL_CONTEXT of NULL_TREE.
* decl.c (namespace_binding): Replace NULL_TREE with
global_namespace.
(set_namespace_binding, pop_namespace, lookup_name_real): Likewise.
* decl2.c (is_namespace_ancestor, lookup_using_namespace):
Likewise.
* decl.c (pushtag): Use FROB_CONTEXT.
(pushdecl, make_typename_type, define_function, grokdeclarator):
Likewise.
* decl2.c (set_decl_namespace, do_namespace_alias): Likewise.
* pt.c (push_template_decl_real, lookup_template_class, tsubst):
Likewise.
* decl2.c (decl_namespace): Return global_namespace if no context.
* method.c (build_overload_nested_name): Expect null as context.
* pt.c (mangle_class_name_for_template): Do nothing for null
contexts.
(lookup_template_class): Allow for null id_context.
From-SVN: r20710
1998-06-25 05:28:35 +02:00
|
|
|
|
return is_namespace_ancestor (root, CP_DECL_CONTEXT (child));
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Return the namespace that is the common ancestor
|
|
|
|
|
of two given namespaces. */
|
|
|
|
|
|
1998-07-16 23:16:06 +02:00
|
|
|
|
tree
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
namespace_ancestor (ns1, ns2)
|
|
|
|
|
tree ns1, ns2;
|
|
|
|
|
{
|
|
|
|
|
if (is_namespace_ancestor (ns1, ns2))
|
|
|
|
|
return ns1;
|
1998-07-14 22:47:48 +02:00
|
|
|
|
return namespace_ancestor (CP_DECL_CONTEXT (ns1), ns2);
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Insert used into the using list of user. Set indirect_flag if this
|
|
|
|
|
directive is not directly from the source. Also find the common
|
|
|
|
|
ancestor and let our users know about the new namespace */
|
|
|
|
|
static void
|
|
|
|
|
add_using_namespace (user, used, indirect)
|
|
|
|
|
tree user;
|
|
|
|
|
tree used;
|
|
|
|
|
int indirect;
|
|
|
|
|
{
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
tree t;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Using oneself is a no-op. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
if (user == used)
|
|
|
|
|
return;
|
|
|
|
|
my_friendly_assert (TREE_CODE (user) == NAMESPACE_DECL, 380);
|
|
|
|
|
my_friendly_assert (TREE_CODE (used) == NAMESPACE_DECL, 380);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Check if we already have this. */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
t = purpose_member (used, DECL_NAMESPACE_USING (user));
|
|
|
|
|
if (t != NULL_TREE)
|
|
|
|
|
{
|
|
|
|
|
if (!indirect)
|
|
|
|
|
/* Promote to direct usage. */
|
|
|
|
|
TREE_INDIRECT_USING (t) = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Add used to the user's using list. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
DECL_NAMESPACE_USING (user)
|
1999-09-09 08:17:13 +02:00
|
|
|
|
= tree_cons (used, namespace_ancestor (user, used),
|
|
|
|
|
DECL_NAMESPACE_USING (user));
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
|
|
|
|
|
TREE_INDIRECT_USING (DECL_NAMESPACE_USING (user)) = indirect;
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Add user to the used's users list. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
DECL_NAMESPACE_USERS (used)
|
1999-09-09 08:17:13 +02:00
|
|
|
|
= tree_cons (user, 0, DECL_NAMESPACE_USERS (used));
|
1998-07-15 19:27:24 +02:00
|
|
|
|
|
|
|
|
|
/* Recursively add all namespaces used. */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
for (t = DECL_NAMESPACE_USING (used); t; t = TREE_CHAIN (t))
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
/* indirect usage */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
add_using_namespace (user, TREE_PURPOSE (t), 1);
|
1998-07-15 19:27:24 +02:00
|
|
|
|
|
|
|
|
|
/* Tell everyone using us about the new used namespaces. */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
for (t = DECL_NAMESPACE_USERS (user); t; t = TREE_CHAIN (t))
|
|
|
|
|
add_using_namespace (TREE_PURPOSE (t), used, 1);
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-10-04 00:53:37 +02:00
|
|
|
|
/* Combines two sets of overloaded functions into an OVERLOAD chain, removing
|
|
|
|
|
duplicates. The first list becomes the tail of the result.
|
|
|
|
|
|
1998-10-06 16:20:30 +02:00
|
|
|
|
The algorithm is O(n^2). We could get this down to O(n log n) by
|
|
|
|
|
doing a sort on the addresses of the functions, if that becomes
|
|
|
|
|
necessary. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
merge_functions (s1, s2)
|
|
|
|
|
tree s1;
|
|
|
|
|
tree s2;
|
|
|
|
|
{
|
1998-10-04 00:53:37 +02:00
|
|
|
|
for (; s2; s2 = OVL_NEXT (s2))
|
|
|
|
|
{
|
2001-11-30 04:14:56 +01:00
|
|
|
|
tree fn2 = OVL_CURRENT (s2);
|
|
|
|
|
tree fns1;
|
|
|
|
|
|
|
|
|
|
for (fns1 = s1; fns1; fns1 = OVL_NEXT (fns1))
|
|
|
|
|
{
|
|
|
|
|
tree fn1 = OVL_CURRENT (fns1);
|
|
|
|
|
|
|
|
|
|
/* If the function from S2 is already in S1, there is no
|
|
|
|
|
need to add it again. For `extern "C"' functions, we
|
|
|
|
|
might have two FUNCTION_DECLs for the same function, in
|
|
|
|
|
different namespaces; again, we only need one of them. */
|
|
|
|
|
if (fn1 == fn2
|
|
|
|
|
|| (DECL_EXTERN_C_P (fn1) && DECL_EXTERN_C_P (fn2)
|
|
|
|
|
&& DECL_NAME (fn1) == DECL_NAME (fn2)))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we exhausted all of the functions in S1, FN2 is new. */
|
|
|
|
|
if (!fns1)
|
|
|
|
|
s1 = build_overload (fn2, s1);
|
1998-10-04 00:53:37 +02:00
|
|
|
|
}
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return s1;
|
|
|
|
|
}
|
|
|
|
|
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
/* This should return an error not all definitions define functions.
|
|
|
|
|
It is not an error if we find two functions with exactly the
|
|
|
|
|
same signature, only if these are selected in overload resolution.
|
1998-05-08 04:06:26 +02:00
|
|
|
|
old is the current set of bindings, new the freshly-found binding.
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
XXX Do we want to give *all* candidates in case of ambiguity?
|
|
|
|
|
XXX In what way should I treat extern declarations?
|
|
|
|
|
XXX I don't want to repeat the entire duplicate_decls here */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
static tree
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
ambiguous_decl (name, old, new, flags)
|
1998-05-08 04:06:26 +02:00
|
|
|
|
tree name;
|
|
|
|
|
tree old;
|
|
|
|
|
tree new;
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
int flags;
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
{
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
tree val, type;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
my_friendly_assert (old != NULL_TREE, 393);
|
|
|
|
|
/* Copy the value. */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
val = BINDING_VALUE (new);
|
|
|
|
|
if (val)
|
|
|
|
|
switch (TREE_CODE (val))
|
|
|
|
|
{
|
|
|
|
|
case TEMPLATE_DECL:
|
|
|
|
|
/* If we expect types or namespaces, and not templates,
|
|
|
|
|
or this is not a template class. */
|
|
|
|
|
if (LOOKUP_QUALIFIERS_ONLY (flags)
|
1999-03-13 00:17:05 +01:00
|
|
|
|
&& !DECL_CLASS_TEMPLATE_P (val))
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
val = NULL_TREE;
|
|
|
|
|
break;
|
|
|
|
|
case TYPE_DECL:
|
|
|
|
|
if (LOOKUP_NAMESPACES_ONLY (flags))
|
|
|
|
|
val = NULL_TREE;
|
|
|
|
|
break;
|
|
|
|
|
case NAMESPACE_DECL:
|
|
|
|
|
if (LOOKUP_TYPES_ONLY (flags))
|
|
|
|
|
val = NULL_TREE;
|
|
|
|
|
break;
|
2002-03-29 21:41:53 +01:00
|
|
|
|
case FUNCTION_DECL:
|
|
|
|
|
/* Ignore built-in functions that are still anticipated. */
|
|
|
|
|
if (LOOKUP_QUALIFIERS_ONLY (flags) || DECL_ANTICIPATED (val))
|
|
|
|
|
val = NULL_TREE;
|
|
|
|
|
break;
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
default:
|
|
|
|
|
if (LOOKUP_QUALIFIERS_ONLY (flags))
|
|
|
|
|
val = NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (!BINDING_VALUE (old))
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
BINDING_VALUE (old) = val;
|
|
|
|
|
else if (val && val != BINDING_VALUE (old))
|
1998-05-08 04:06:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (is_overloaded_fn (BINDING_VALUE (old))
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
&& is_overloaded_fn (val))
|
1998-05-08 04:06:26 +02:00
|
|
|
|
{
|
|
|
|
|
BINDING_VALUE (old) = merge_functions (BINDING_VALUE (old),
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
val);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Some declarations are functions, some are not. */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
if (flags & LOOKUP_COMPLAIN)
|
|
|
|
|
{
|
1998-12-07 13:27:47 +01:00
|
|
|
|
/* If we've already given this error for this lookup,
|
|
|
|
|
BINDING_VALUE (old) is error_mark_node, so let's not
|
|
|
|
|
repeat ourselves. */
|
|
|
|
|
if (BINDING_VALUE (old) != error_mark_node)
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("use of `%D' is ambiguous", name);
|
1998-12-07 13:27:47 +01:00
|
|
|
|
cp_error_at (" first declared as `%#D' here",
|
|
|
|
|
BINDING_VALUE (old));
|
|
|
|
|
}
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_error_at (" also declared as `%#D' here", val);
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
}
|
1999-12-15 02:34:16 +01:00
|
|
|
|
BINDING_VALUE (old) = error_mark_node;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* ... and copy the type. */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
type = BINDING_TYPE (new);
|
|
|
|
|
if (LOOKUP_NAMESPACES_ONLY (flags))
|
|
|
|
|
type = NULL_TREE;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (!BINDING_TYPE (old))
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
BINDING_TYPE (old) = type;
|
1998-07-16 19:48:39 +02:00
|
|
|
|
else if (type && BINDING_TYPE (old) != type)
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
{
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
if (flags & LOOKUP_COMPLAIN)
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%D' denotes an ambiguous type",name);
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_error_at (" first type here", BINDING_TYPE (old));
|
|
|
|
|
cp_error_at (" other type here", type);
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
}
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return old;
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
1999-08-14 13:08:53 +02:00
|
|
|
|
/* Subroutine of unualified_namespace_lookup:
|
|
|
|
|
Add the bindings of NAME in used namespaces to VAL.
|
|
|
|
|
We are currently looking for names in namespace SCOPE, so we
|
|
|
|
|
look through USINGS for using-directives of namespaces
|
|
|
|
|
which have SCOPE as a common ancestor with the current scope.
|
1998-05-08 04:06:26 +02:00
|
|
|
|
Returns zero on errors. */
|
|
|
|
|
|
|
|
|
|
int
|
1999-08-14 13:08:53 +02:00
|
|
|
|
lookup_using_namespace (name, val, usings, scope, flags, spacesp)
|
1998-07-12 17:41:22 +02:00
|
|
|
|
tree name, val, usings, scope;
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
int flags;
|
1999-08-14 13:08:53 +02:00
|
|
|
|
tree *spacesp;
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
{
|
|
|
|
|
tree iter;
|
|
|
|
|
tree val1;
|
1998-07-12 17:41:22 +02:00
|
|
|
|
/* Iterate over all used namespaces in current, searching for using
|
|
|
|
|
directives of scope. */
|
|
|
|
|
for (iter = usings; iter; iter = TREE_CHAIN (iter))
|
|
|
|
|
if (TREE_VALUE (iter) == scope)
|
|
|
|
|
{
|
1999-08-14 13:08:53 +02:00
|
|
|
|
if (spacesp)
|
1999-09-09 08:17:13 +02:00
|
|
|
|
*spacesp = tree_cons (TREE_PURPOSE (iter), NULL_TREE,
|
|
|
|
|
*spacesp);
|
1998-07-12 17:41:22 +02:00
|
|
|
|
val1 = binding_for_name (name, TREE_PURPOSE (iter));
|
|
|
|
|
/* Resolve ambiguities. */
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
val = ambiguous_decl (name, val, val1, flags);
|
1998-07-12 17:41:22 +02:00
|
|
|
|
}
|
1999-12-15 02:34:16 +01:00
|
|
|
|
return BINDING_VALUE (val) != error_mark_node;
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* [namespace.qual]
|
1999-08-07 03:01:54 +02:00
|
|
|
|
Accepts the NAME to lookup and its qualifying SCOPE.
|
|
|
|
|
Returns the name/type pair found into the CPLUS_BINDING RESULT,
|
1998-05-08 04:06:26 +02:00
|
|
|
|
or 0 on error. */
|
|
|
|
|
|
|
|
|
|
int
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
qualified_lookup_using_namespace (name, scope, result, flags)
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
tree name;
|
|
|
|
|
tree scope;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
tree result;
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
int flags;
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
{
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Maintain a list of namespaces visited... */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
tree seen = NULL_TREE;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* ... and a list of namespace yet to see. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
tree todo = NULL_TREE;
|
|
|
|
|
tree usings;
|
2000-05-22 09:23:26 +02:00
|
|
|
|
/* Look through namespace aliases. */
|
|
|
|
|
scope = ORIGINAL_NAMESPACE (scope);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
while (scope && (result != error_mark_node))
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
{
|
1999-12-16 04:10:12 +01:00
|
|
|
|
seen = tree_cons (scope, NULL_TREE, seen);
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
result = ambiguous_decl (name, result,
|
|
|
|
|
binding_for_name (name, scope), flags);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (!BINDING_VALUE (result) && !BINDING_TYPE (result))
|
|
|
|
|
/* Consider using directives. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
for (usings = DECL_NAMESPACE_USING (scope); usings;
|
|
|
|
|
usings = TREE_CHAIN (usings))
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* If this was a real directive, and we have not seen it. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
if (!TREE_INDIRECT_USING (usings)
|
1998-07-12 03:30:11 +02:00
|
|
|
|
&& !purpose_member (TREE_PURPOSE (usings), seen))
|
1999-12-16 04:10:12 +01:00
|
|
|
|
todo = tree_cons (TREE_PURPOSE (usings), NULL_TREE, todo);
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
if (todo)
|
|
|
|
|
{
|
|
|
|
|
scope = TREE_PURPOSE (todo);
|
|
|
|
|
todo = TREE_CHAIN (todo);
|
|
|
|
|
}
|
|
|
|
|
else
|
1998-05-08 04:06:26 +02:00
|
|
|
|
scope = NULL_TREE; /* If there never was a todo list. */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return result != error_mark_node;
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
}
|
1994-12-16 03:07:31 +01:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* [namespace.memdef]/2 */
|
|
|
|
|
|
|
|
|
|
/* Set the context of a declaration to scope. Complain if we are not
|
|
|
|
|
outside scope. */
|
|
|
|
|
|
|
|
|
|
void
|
1999-02-25 01:11:35 +01:00
|
|
|
|
set_decl_namespace (decl, scope, friendp)
|
1998-05-08 04:06:26 +02:00
|
|
|
|
tree decl;
|
|
|
|
|
tree scope;
|
1999-02-25 01:11:35 +01:00
|
|
|
|
int friendp;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
{
|
|
|
|
|
tree old;
|
2001-08-02 12:51:17 +02:00
|
|
|
|
|
1998-06-05 04:26:55 +02:00
|
|
|
|
/* Get rid of namespace aliases. */
|
|
|
|
|
scope = ORIGINAL_NAMESPACE (scope);
|
|
|
|
|
|
1999-02-25 01:11:35 +01:00
|
|
|
|
/* It is ok for friends to be qualified in parallel space. */
|
|
|
|
|
if (!friendp && !is_namespace_ancestor (current_namespace, scope))
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("declaration of `%D' not in a namespace surrounding `%D'",
|
1998-05-08 04:06:26 +02:00
|
|
|
|
decl, scope);
|
cp-tree.h (CP_DECL_CONTEXT): New macro.
* cp-tree.h (CP_DECL_CONTEXT): New macro.
* decl2.c (is_namespace_ancestor, lookup_using_namespace): Use it.
* method.c (build_overload_nested_name): Likewise.
* sig.c (build_signature_pointer_or_reference_type): Don't set
DECL_CONTEXT.
Set DECL_CONTEXT for globals to NULL_TREE instead of global_namespace.
* cp-tree.h (FROB_CONTEXT): New macro.
(DECL_MAIN_P): ::main should have a DECL_CONTEXT of NULL_TREE.
* decl.c (namespace_binding): Replace NULL_TREE with
global_namespace.
(set_namespace_binding, pop_namespace, lookup_name_real): Likewise.
* decl2.c (is_namespace_ancestor, lookup_using_namespace):
Likewise.
* decl.c (pushtag): Use FROB_CONTEXT.
(pushdecl, make_typename_type, define_function, grokdeclarator):
Likewise.
* decl2.c (set_decl_namespace, do_namespace_alias): Likewise.
* pt.c (push_template_decl_real, lookup_template_class, tsubst):
Likewise.
* decl2.c (decl_namespace): Return global_namespace if no context.
* method.c (build_overload_nested_name): Expect null as context.
* pt.c (mangle_class_name_for_template): Do nothing for null
contexts.
(lookup_template_class): Allow for null id_context.
From-SVN: r20710
1998-06-25 05:28:35 +02:00
|
|
|
|
DECL_CONTEXT (decl) = FROB_CONTEXT (scope);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (scope != current_namespace)
|
|
|
|
|
{
|
|
|
|
|
/* See whether this has been declared in the namespace. */
|
|
|
|
|
old = namespace_binding (DECL_NAME (decl), scope);
|
|
|
|
|
if (!old)
|
|
|
|
|
/* No old declaration at all. */
|
|
|
|
|
goto complain;
|
2001-02-19 22:47:08 +01:00
|
|
|
|
/* A template can be explicitly specialized in any namespace. */
|
|
|
|
|
if (processing_explicit_instantiation)
|
|
|
|
|
return;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (!is_overloaded_fn (decl))
|
|
|
|
|
/* Don't compare non-function decls with decls_match here,
|
|
|
|
|
since it can't check for the correct constness at this
|
|
|
|
|
point. pushdecl will find those errors later. */
|
|
|
|
|
return;
|
|
|
|
|
/* Since decl is a function, old should contain a function decl. */
|
|
|
|
|
if (!is_overloaded_fn (old))
|
|
|
|
|
goto complain;
|
1999-08-10 18:58:24 +02:00
|
|
|
|
if (processing_template_decl || processing_specialization)
|
|
|
|
|
/* We have not yet called push_template_decl to turn the
|
|
|
|
|
FUNCTION_DECL into a TEMPLATE_DECL, so the declarations
|
|
|
|
|
won't match. But, we'll check later, when we construct the
|
|
|
|
|
template. */
|
|
|
|
|
return;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
for (; old; old = OVL_NEXT (old))
|
|
|
|
|
if (decls_match (decl, OVL_CURRENT (old)))
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return;
|
|
|
|
|
complain:
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%D' should have been declared inside `%D'",
|
1998-05-08 04:06:26 +02:00
|
|
|
|
decl, scope);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute the namespace where a declaration is defined. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
Warning fixes:
* call.c (op_error): Const-ify a char*.
(add_candidate, source_type, add_warning): Add static prototype.
(print_z_candidates): Const-ify a char*.
* class.c (resolve_address_of_overloaded_function,
fixed_type_or_null, build_vtable_entry_ref): Add static prototype.
(get_vtable_name, finish_struct_1): Const-ify a char*.
* cvt.c (convert_to_reference): Likewise.
* decl.c (redeclaration_error_message, record_builtin_type,
record_unknown_type, member_function_or_else, bad_specifiers):
Likewise.
(find_binding, select_decl, unqualified_namespace_lookup,
lookup_flags, qualify_lookup, record_builtin_java_type, tag_name):
Add static prototype.
(warn_extern_redeclared_static, duplicate_decls, pushdecl,
implicitly_declare, record_builtin_java_type, define_function,
grok_op_properties, tag_name): Const-ify a char*.
* cp-tree.h (FORMAT_VBASE_NAME): Allow parameter `BUF' to be const.
(define_function, finish_builtin_type): Const-ify a char*.
(cp_error, cp_error_at, cp_warning, cp_warning_at, cp_pedwarn,
cp_pedwarn_at, cp_compiler_error, cp_sprintf): Add prototype args.
(file_name_nondirectory): Const-ify a char*.
(init_filename_times): Don't prototype.
(compiler_error): Prototype.
(yyerror, init_repo): Const-ify a char*.
(build_srcloc): Don't prototype.
(build_x_indirect_ref, build_indirect_ref, build_component_addr):
Const-ify a char*.
(warn_for_assignment): Don't prototype.
(convert_for_initialization, readonly_error, check_for_new_type,
GNU_xref_begin, GNU_xref_file, GNU_xref_ref, GNU_xref_call):
Const-ify a char*.
* decl2.c (acceptable_java_type, output_vtable_inherit,
setup_initp, start_objects, finish_objects, do_dtors, do_ctors,
merge_functions, decl_namespace, validate_nonmember_using_decl,
do_nonmember_using_decl): Add static prototype.
(lang_f_options): Const-ify a char*.
(finish_builtin_type): Likewise.
(add_function, arg_assoc_namespace, arg_assoc_class): Add static
prototype.
* errfn.c: Include cp-tree.h.
(cp_thing): Add static prototype.
(compiler_error): Don't protoptype.
(cp_compiler_error): Cast `compiler_error' to `errorfn' before
passing it to `cp_thing'.
* error.c (interesting_scope_p): Add static prototype.
* except.c (build_eh_type_type, build_eh_type_type_ref): Const-ify
a char*.
* init.c (compiler_error): Don't prototype.
(member_init_ok_or_else): Const-ify a char*.
(build_java_class_ref): Add static prototype.
* lex.c (compiler_error): Don't prototype.
(get_time_identifier, interface_strcmp, extend_token_buffer,
handle_cp_pragma): Const-ify a char*.
(is_global, init_filename_times): Add static prototype.
(file_name_nondirectory, cplus_tree_code_name): Const-ify a char*.
(compiler_error): Change from fixed args to variable args.
(yyerror): Const-ify a char*.
* parse.y (cond_stmt_keyword): Const-ify a char*.
(parse_decl): Add static prototype.
* pt.c (template_args_equal, print_template_context): Likewise.
(print_candidates, check_default_tmpl_args): Const-ify a char*.
(instantiate_class_template): Likewise.
* repo.c (get_base_filename, open_repo_file, init_repo): Likewise.
* rtti.c (call_void_fn, expand_generic_desc, expand_si_desc,
expand_class_desc, expand_ptr_desc, expand_attr_desc): Likewise.
* search.c (lookup_field_info, lookup_member): Likewise.
(lookup_member): Cast the first argument of `bzero' to a PTR.
* sig.c (compiler_error): Don't prototype.
(build_signature_pointer_or_reference_nam): Const-ify a char*.
(get_sigtable_name, build_member_function_pointer): Likewise.
* tree.c (compiler_error): Don't prototype.
(no_linkage_helper, build_srcloc): Add static prototype.
(build_vbase_pointer_fields): Const-ify a char*.
(__eprintf): Don't unnecessarily handle `const' when !__STDC__.
* typeck.c (compiler_error): Don't prototype.
(convert_for_assignment): Const-ify a char*.
(comp_cv_target_types): Add static prototype.
(build_x_indirect_ref, build_indirect_ref, convert_arguments,
build_component_addr, build_unary_op, convert_for_initialization):
Const-ify a char*.
* typeck2.c (ack): Add static prototype and change from fixed args
to variable args.
(readonly_error, check_for_new_type): Const-ify a char*.
* xref.c (_XREF_FILE, find_file, filename, fctname, declname,
fixname, open_xref_file, classname, GNU_xref_begin): Likewise.
(GNU_xref_file): Likewise. Also use `xmalloc' instead of `malloc'.
(GNU_xref_end_scope, GNU_xref_ref, GNU_xref_decl, GNU_xref_call,
gen_assign, GNU_xref_member): Const-ify a char*.
From-SVN: r25994
1999-03-26 08:45:00 +01:00
|
|
|
|
static tree
|
1998-05-08 04:06:26 +02:00
|
|
|
|
decl_namespace (decl)
|
|
|
|
|
tree decl;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
{
|
2000-04-11 02:38:39 +02:00
|
|
|
|
if (TYPE_P (decl))
|
|
|
|
|
decl = TYPE_STUB_DECL (decl);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
while (DECL_CONTEXT (decl))
|
|
|
|
|
{
|
|
|
|
|
decl = DECL_CONTEXT (decl);
|
|
|
|
|
if (TREE_CODE (decl) == NAMESPACE_DECL)
|
|
|
|
|
return decl;
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
if (TYPE_P (decl))
|
1998-05-08 04:06:26 +02:00
|
|
|
|
decl = TYPE_STUB_DECL (decl);
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
my_friendly_assert (DECL_P (decl), 390);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
cp-tree.h (CP_DECL_CONTEXT): New macro.
* cp-tree.h (CP_DECL_CONTEXT): New macro.
* decl2.c (is_namespace_ancestor, lookup_using_namespace): Use it.
* method.c (build_overload_nested_name): Likewise.
* sig.c (build_signature_pointer_or_reference_type): Don't set
DECL_CONTEXT.
Set DECL_CONTEXT for globals to NULL_TREE instead of global_namespace.
* cp-tree.h (FROB_CONTEXT): New macro.
(DECL_MAIN_P): ::main should have a DECL_CONTEXT of NULL_TREE.
* decl.c (namespace_binding): Replace NULL_TREE with
global_namespace.
(set_namespace_binding, pop_namespace, lookup_name_real): Likewise.
* decl2.c (is_namespace_ancestor, lookup_using_namespace):
Likewise.
* decl.c (pushtag): Use FROB_CONTEXT.
(pushdecl, make_typename_type, define_function, grokdeclarator):
Likewise.
* decl2.c (set_decl_namespace, do_namespace_alias): Likewise.
* pt.c (push_template_decl_real, lookup_template_class, tsubst):
Likewise.
* decl2.c (decl_namespace): Return global_namespace if no context.
* method.c (build_overload_nested_name): Expect null as context.
* pt.c (mangle_class_name_for_template): Do nothing for null
contexts.
(lookup_template_class): Allow for null id_context.
From-SVN: r20710
1998-06-25 05:28:35 +02:00
|
|
|
|
return global_namespace;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Return the namespace where the current declaration is declared. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1994-12-16 03:07:31 +01:00
|
|
|
|
tree
|
1998-05-08 04:06:26 +02:00
|
|
|
|
current_decl_namespace ()
|
1994-12-16 03:07:31 +01:00
|
|
|
|
{
|
1998-05-08 04:06:26 +02:00
|
|
|
|
tree result;
|
|
|
|
|
/* If we have been pushed into a different namespace, use it. */
|
|
|
|
|
if (decl_namespace_list)
|
|
|
|
|
return TREE_PURPOSE (decl_namespace_list);
|
|
|
|
|
|
|
|
|
|
if (current_class_type)
|
1998-07-17 18:29:25 +02:00
|
|
|
|
result = decl_namespace (TYPE_STUB_DECL (current_class_type));
|
1998-05-08 04:06:26 +02:00
|
|
|
|
else if (current_function_decl)
|
1998-07-17 18:29:25 +02:00
|
|
|
|
result = decl_namespace (current_function_decl);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
else
|
|
|
|
|
result = current_namespace;
|
|
|
|
|
return result;
|
|
|
|
|
}
|
1994-12-16 03:07:31 +01:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Temporarily set the namespace for the current declaration. */
|
1994-12-16 03:07:31 +01:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
void
|
|
|
|
|
push_decl_namespace (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (decl) != NAMESPACE_DECL)
|
|
|
|
|
decl = decl_namespace (decl);
|
2000-07-03 17:43:49 +02:00
|
|
|
|
decl_namespace_list = tree_cons (ORIGINAL_NAMESPACE (decl),
|
|
|
|
|
NULL_TREE, decl_namespace_list);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pop_decl_namespace ()
|
|
|
|
|
{
|
|
|
|
|
decl_namespace_list = TREE_CHAIN (decl_namespace_list);
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-22 16:52:02 +02:00
|
|
|
|
/* Enter a class or namespace scope. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
push_scope (t)
|
|
|
|
|
tree t;
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (t) == NAMESPACE_DECL)
|
|
|
|
|
push_decl_namespace (t);
|
|
|
|
|
else
|
|
|
|
|
pushclass (t, 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Leave scope pushed by push_scope. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pop_scope (t)
|
|
|
|
|
tree t;
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (t) == NAMESPACE_DECL)
|
|
|
|
|
pop_decl_namespace ();
|
|
|
|
|
else
|
1999-04-14 15:20:19 +02:00
|
|
|
|
popclass ();
|
1998-10-22 16:52:02 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* [basic.lookup.koenig] */
|
|
|
|
|
/* A non-zero return value in the functions below indicates an error.
|
|
|
|
|
All nodes allocated in the procedure are on the scratch obstack. */
|
|
|
|
|
|
|
|
|
|
struct arg_lookup
|
|
|
|
|
{
|
|
|
|
|
tree name;
|
|
|
|
|
tree namespaces;
|
|
|
|
|
tree classes;
|
|
|
|
|
tree functions;
|
|
|
|
|
};
|
|
|
|
|
|
2000-01-26 21:51:37 +01:00
|
|
|
|
static int arg_assoc PARAMS ((struct arg_lookup*, tree));
|
|
|
|
|
static int arg_assoc_args PARAMS ((struct arg_lookup*, tree));
|
|
|
|
|
static int arg_assoc_type PARAMS ((struct arg_lookup*, tree));
|
|
|
|
|
static int add_function PARAMS ((struct arg_lookup *, tree));
|
|
|
|
|
static int arg_assoc_namespace PARAMS ((struct arg_lookup *, tree));
|
|
|
|
|
static int arg_assoc_class PARAMS ((struct arg_lookup *, tree));
|
|
|
|
|
static int arg_assoc_template_arg PARAMS ((struct arg_lookup*, tree));
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
1998-07-15 18:56:50 +02:00
|
|
|
|
/* Add a function to the lookup structure.
|
|
|
|
|
Returns 1 on error. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
add_function (k, fn)
|
|
|
|
|
struct arg_lookup *k;
|
|
|
|
|
tree fn;
|
|
|
|
|
{
|
1999-08-14 13:08:53 +02:00
|
|
|
|
/* We used to check here to see if the function was already in the list,
|
|
|
|
|
but that's O(n^2), which is just too expensive for function lookup.
|
|
|
|
|
Now we deal with the occasional duplicate in joust. In doing this, we
|
|
|
|
|
assume that the number of duplicates will be small compared to the
|
|
|
|
|
total number of functions being compared, which should usually be the
|
|
|
|
|
case. */
|
|
|
|
|
|
1998-07-15 01:34:17 +02:00
|
|
|
|
/* We must find only functions, or exactly one non-function. */
|
2000-08-12 03:30:06 +02:00
|
|
|
|
if (!k->functions)
|
|
|
|
|
k->functions = fn;
|
|
|
|
|
else if (is_overloaded_fn (k->functions) && is_overloaded_fn (fn))
|
1998-07-15 01:34:17 +02:00
|
|
|
|
k->functions = build_overload (fn, k->functions);
|
2000-08-12 03:30:06 +02:00
|
|
|
|
else
|
1999-08-14 13:08:53 +02:00
|
|
|
|
{
|
|
|
|
|
tree f1 = OVL_CURRENT (k->functions);
|
|
|
|
|
tree f2 = fn;
|
|
|
|
|
if (is_overloaded_fn (f1))
|
|
|
|
|
{
|
|
|
|
|
fn = f1; f1 = f2; f2 = fn;
|
|
|
|
|
}
|
|
|
|
|
cp_error_at ("`%D' is not a function,", f1);
|
|
|
|
|
cp_error_at (" conflict with `%D'", f2);
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error (" in call to `%D'", k->name);
|
1999-08-14 13:08:53 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
2000-08-12 03:30:06 +02:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-15 18:56:50 +02:00
|
|
|
|
/* Add functions of a namespace to the lookup structure.
|
|
|
|
|
Returns 1 on error. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
arg_assoc_namespace (k, scope)
|
|
|
|
|
struct arg_lookup *k;
|
|
|
|
|
tree scope;
|
|
|
|
|
{
|
|
|
|
|
tree value;
|
|
|
|
|
|
|
|
|
|
if (purpose_member (scope, k->namespaces))
|
|
|
|
|
return 0;
|
|
|
|
|
k->namespaces = tree_cons (scope, NULL_TREE, k->namespaces);
|
|
|
|
|
|
|
|
|
|
value = namespace_binding (k->name, scope);
|
|
|
|
|
if (!value)
|
|
|
|
|
return 0;
|
1999-08-14 13:08:53 +02:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
for (; value; value = OVL_NEXT (value))
|
|
|
|
|
if (add_function (k, OVL_CURRENT (value)))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
}
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
1999-09-02 19:29:11 +02:00
|
|
|
|
/* Adds everything associated with a template argument to the lookup
|
|
|
|
|
structure. Returns 1 on error. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
arg_assoc_template_arg (k, arg)
|
|
|
|
|
struct arg_lookup* k;
|
|
|
|
|
tree arg;
|
|
|
|
|
{
|
|
|
|
|
/* [basic.lookup.koenig]
|
|
|
|
|
|
|
|
|
|
If T is a template-id, its associated namespaces and classes are
|
|
|
|
|
... the namespaces and classes associated with the types of the
|
|
|
|
|
template arguments provided for template type parameters
|
|
|
|
|
(excluding template template parameters); the namespaces in which
|
|
|
|
|
any template template arguments are defined; and the classes in
|
|
|
|
|
which any member templates used as template template arguments
|
|
|
|
|
are defined. [Note: non-type template arguments do not
|
|
|
|
|
contribute to the set of associated namespaces. ] */
|
|
|
|
|
|
|
|
|
|
/* Consider first template template arguments. */
|
2001-10-23 11:14:15 +02:00
|
|
|
|
if (TREE_CODE (arg) == TEMPLATE_TEMPLATE_PARM
|
|
|
|
|
|| TREE_CODE (arg) == UNBOUND_CLASS_TEMPLATE)
|
2000-09-05 03:01:39 +02:00
|
|
|
|
return 0;
|
|
|
|
|
else if (TREE_CODE (arg) == TEMPLATE_DECL)
|
1999-09-02 19:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
tree ctx = CP_DECL_CONTEXT (arg);
|
|
|
|
|
|
|
|
|
|
/* It's not a member template. */
|
|
|
|
|
if (TREE_CODE (ctx) == NAMESPACE_DECL)
|
|
|
|
|
return arg_assoc_namespace (k, ctx);
|
|
|
|
|
/* Otherwise, it must be member template. */
|
|
|
|
|
else
|
|
|
|
|
return arg_assoc_class (k, ctx);
|
|
|
|
|
}
|
|
|
|
|
/* It's not a template template argument, but it is a type template
|
|
|
|
|
argument. */
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
else if (TYPE_P (arg))
|
1999-09-02 19:29:11 +02:00
|
|
|
|
return arg_assoc_type (k, arg);
|
|
|
|
|
/* It's a non-type template argument. */
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-15 18:56:50 +02:00
|
|
|
|
/* Adds everything associated with class to the lookup structure.
|
|
|
|
|
Returns 1 on error. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
arg_assoc_class (k, type)
|
|
|
|
|
struct arg_lookup* k;
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
tree list, friends, context;
|
|
|
|
|
int i;
|
|
|
|
|
|
1999-08-29 03:20:54 +02:00
|
|
|
|
/* Backend build structures, such as __builtin_va_list, aren't
|
|
|
|
|
affected by all this. */
|
|
|
|
|
if (!CLASS_TYPE_P (type))
|
|
|
|
|
return 0;
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (purpose_member (type, k->classes))
|
|
|
|
|
return 0;
|
|
|
|
|
k->classes = tree_cons (type, NULL_TREE, k->classes);
|
|
|
|
|
|
|
|
|
|
context = decl_namespace (TYPE_MAIN_DECL (type));
|
|
|
|
|
if (arg_assoc_namespace (k, context))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* Process baseclasses. */
|
|
|
|
|
for (i = 0; i < CLASSTYPE_N_BASECLASSES (type); i++)
|
|
|
|
|
if (arg_assoc_class (k, TYPE_BINFO_BASETYPE (type, i)))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* Process friends. */
|
|
|
|
|
for (list = DECL_FRIENDLIST (TYPE_MAIN_DECL (type)); list;
|
|
|
|
|
list = TREE_CHAIN (list))
|
|
|
|
|
if (k->name == TREE_PURPOSE (list))
|
|
|
|
|
for (friends = TREE_VALUE (list); friends;
|
|
|
|
|
friends = TREE_CHAIN (friends))
|
|
|
|
|
/* Only interested in global functions with potentially hidden
|
|
|
|
|
(i.e. unqualified) declarations. */
|
2001-01-19 16:12:33 +01:00
|
|
|
|
if (TREE_PURPOSE (friends) == error_mark_node && TREE_VALUE (friends)
|
|
|
|
|
&& decl_namespace (TREE_VALUE (friends)) == context)
|
|
|
|
|
if (add_function (k, TREE_VALUE (friends)))
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return 1;
|
1998-07-16 02:16:25 +02:00
|
|
|
|
|
|
|
|
|
/* Process template arguments. */
|
|
|
|
|
if (CLASSTYPE_TEMPLATE_INFO (type))
|
|
|
|
|
{
|
2000-06-03 23:42:49 +02:00
|
|
|
|
list = INNERMOST_TEMPLATE_ARGS (CLASSTYPE_TI_ARGS (type));
|
1999-09-02 19:29:11 +02:00
|
|
|
|
for (i = 0; i < TREE_VEC_LENGTH (list); ++i)
|
|
|
|
|
arg_assoc_template_arg (k, TREE_VEC_ELT (list, i));
|
1998-07-16 02:16:25 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-15 18:56:50 +02:00
|
|
|
|
/* Adds everything associated with a given type.
|
|
|
|
|
Returns 1 on error. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
arg_assoc_type (k, type)
|
|
|
|
|
struct arg_lookup *k;
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
switch (TREE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case VOID_TYPE:
|
|
|
|
|
case INTEGER_TYPE:
|
|
|
|
|
case REAL_TYPE:
|
|
|
|
|
case COMPLEX_TYPE:
|
2000-12-04 18:00:04 +01:00
|
|
|
|
case VECTOR_TYPE:
|
1998-05-08 04:06:26 +02:00
|
|
|
|
case CHAR_TYPE:
|
|
|
|
|
case BOOLEAN_TYPE:
|
|
|
|
|
return 0;
|
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
if (TYPE_PTRMEMFUNC_P (type))
|
|
|
|
|
return arg_assoc_type (k, TYPE_PTRMEMFUNC_FN_TYPE (type));
|
|
|
|
|
return arg_assoc_class (k, type);
|
|
|
|
|
case POINTER_TYPE:
|
|
|
|
|
case REFERENCE_TYPE:
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
return arg_assoc_type (k, TREE_TYPE (type));
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
case ENUMERAL_TYPE:
|
|
|
|
|
return arg_assoc_namespace (k, decl_namespace (TYPE_MAIN_DECL (type)));
|
1998-06-04 03:35:57 +02:00
|
|
|
|
case OFFSET_TYPE:
|
|
|
|
|
/* Pointer to member: associate class type and value type. */
|
|
|
|
|
if (arg_assoc_type (k, TYPE_OFFSET_BASETYPE (type)))
|
|
|
|
|
return 1;
|
|
|
|
|
return arg_assoc_type (k, TREE_TYPE (type));
|
1998-05-08 04:06:26 +02:00
|
|
|
|
case METHOD_TYPE:
|
1998-07-15 18:56:50 +02:00
|
|
|
|
/* The basetype is referenced in the first arg type, so just
|
|
|
|
|
fall through. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
case FUNCTION_TYPE:
|
|
|
|
|
/* Associate the parameter types. */
|
|
|
|
|
if (arg_assoc_args (k, TYPE_ARG_TYPES (type)))
|
|
|
|
|
return 1;
|
|
|
|
|
/* Associate the return type. */
|
|
|
|
|
return arg_assoc_type (k, TREE_TYPE (type));
|
1998-07-15 18:56:50 +02:00
|
|
|
|
case TEMPLATE_TYPE_PARM:
|
2000-09-05 03:01:39 +02:00
|
|
|
|
case BOUND_TEMPLATE_TEMPLATE_PARM:
|
1998-07-15 18:56:50 +02:00
|
|
|
|
return 0;
|
2000-08-18 11:21:04 +02:00
|
|
|
|
case TYPENAME_TYPE:
|
|
|
|
|
return 0;
|
1998-06-04 03:35:57 +02:00
|
|
|
|
case LANG_TYPE:
|
|
|
|
|
if (type == unknown_type_node)
|
|
|
|
|
return 0;
|
|
|
|
|
/* else fall through */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
default:
|
call.c, [...]: Change my_fancy_abort() to abort().
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort().
From-SVN: r49139
2002-01-23 15:26:07 +01:00
|
|
|
|
abort ();
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-15 18:56:50 +02:00
|
|
|
|
/* Adds everything associated with arguments. Returns 1 on error. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
arg_assoc_args (k, args)
|
|
|
|
|
struct arg_lookup* k;
|
|
|
|
|
tree args;
|
|
|
|
|
{
|
|
|
|
|
for (; args; args = TREE_CHAIN (args))
|
|
|
|
|
if (arg_assoc (k, TREE_VALUE (args)))
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-15 18:56:50 +02:00
|
|
|
|
/* Adds everything associated with a given tree_node. Returns 1 on error. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
arg_assoc (k, n)
|
|
|
|
|
struct arg_lookup* k;
|
|
|
|
|
tree n;
|
|
|
|
|
{
|
1998-07-16 02:16:25 +02:00
|
|
|
|
if (n == error_mark_node)
|
|
|
|
|
return 0;
|
|
|
|
|
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
if (TYPE_P (n))
|
1998-07-15 18:56:50 +02:00
|
|
|
|
return arg_assoc_type (k, n);
|
|
|
|
|
|
|
|
|
|
if (! type_unknown_p (n))
|
|
|
|
|
return arg_assoc_type (k, TREE_TYPE (n));
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (n) == ADDR_EXPR)
|
|
|
|
|
n = TREE_OPERAND (n, 0);
|
1998-10-19 22:08:23 +02:00
|
|
|
|
if (TREE_CODE (n) == COMPONENT_REF)
|
|
|
|
|
n = TREE_OPERAND (n, 1);
|
1999-05-10 14:12:58 +02:00
|
|
|
|
if (TREE_CODE (n) == OFFSET_REF)
|
|
|
|
|
n = TREE_OPERAND (n, 1);
|
1998-07-16 02:16:25 +02:00
|
|
|
|
while (TREE_CODE (n) == TREE_LIST)
|
1998-07-15 18:56:50 +02:00
|
|
|
|
n = TREE_VALUE (n);
|
|
|
|
|
|
1998-10-19 22:08:23 +02:00
|
|
|
|
if (TREE_CODE (n) == FUNCTION_DECL)
|
|
|
|
|
return arg_assoc_type (k, TREE_TYPE (n));
|
1998-09-01 11:56:40 +02:00
|
|
|
|
if (TREE_CODE (n) == TEMPLATE_ID_EXPR)
|
|
|
|
|
{
|
|
|
|
|
/* [basic.lookup.koenig]
|
|
|
|
|
|
|
|
|
|
If T is a template-id, its associated namespaces and classes
|
|
|
|
|
are the namespace in which the template is defined; for
|
1999-09-02 19:29:11 +02:00
|
|
|
|
member templates, the member template's class... */
|
1998-09-01 11:56:40 +02:00
|
|
|
|
tree template = TREE_OPERAND (n, 0);
|
|
|
|
|
tree args = TREE_OPERAND (n, 1);
|
|
|
|
|
tree ctx;
|
|
|
|
|
tree arg;
|
|
|
|
|
|
2000-09-04 12:23:29 +02:00
|
|
|
|
if (TREE_CODE (template) == COMPONENT_REF)
|
|
|
|
|
template = TREE_OPERAND (template, 1);
|
|
|
|
|
|
1998-09-01 11:56:40 +02:00
|
|
|
|
/* First, the template. There may actually be more than one if
|
|
|
|
|
this is an overloaded function template. But, in that case,
|
|
|
|
|
we only need the first; all the functions will be in the same
|
|
|
|
|
namespace. */
|
|
|
|
|
template = OVL_CURRENT (template);
|
|
|
|
|
|
|
|
|
|
ctx = CP_DECL_CONTEXT (template);
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (ctx) == NAMESPACE_DECL)
|
|
|
|
|
{
|
|
|
|
|
if (arg_assoc_namespace (k, ctx) == 1)
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
/* It must be a member template. */
|
|
|
|
|
else if (arg_assoc_class (k, ctx) == 1)
|
|
|
|
|
return 1;
|
1998-07-15 18:56:50 +02:00
|
|
|
|
|
1998-09-01 11:56:40 +02:00
|
|
|
|
/* Now the arguments. */
|
|
|
|
|
for (arg = args; arg != NULL_TREE; arg = TREE_CHAIN (arg))
|
1999-09-02 19:29:11 +02:00
|
|
|
|
if (arg_assoc_template_arg (k, TREE_VALUE (arg)) == 1)
|
|
|
|
|
return 1;
|
1998-09-01 11:56:40 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
my_friendly_assert (TREE_CODE (n) == OVERLOAD, 980715);
|
|
|
|
|
|
2000-08-23 00:54:15 +02:00
|
|
|
|
for (; n; n = OVL_CHAIN (n))
|
|
|
|
|
if (arg_assoc_type (k, TREE_TYPE (OVL_FUNCTION (n))))
|
|
|
|
|
return 1;
|
1998-09-01 11:56:40 +02:00
|
|
|
|
}
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Performs Koenig lookup depending on arguments, where fns
|
|
|
|
|
are the functions found in normal lookup. */
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
lookup_arg_dependent (name, fns, args)
|
|
|
|
|
tree name;
|
|
|
|
|
tree fns;
|
|
|
|
|
tree args;
|
|
|
|
|
{
|
|
|
|
|
struct arg_lookup k;
|
2000-01-05 12:45:33 +01:00
|
|
|
|
tree fn = NULL_TREE;
|
1999-08-14 13:08:53 +02:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
k.name = name;
|
|
|
|
|
k.functions = fns;
|
|
|
|
|
k.classes = NULL_TREE;
|
1999-08-14 13:08:53 +02:00
|
|
|
|
|
|
|
|
|
/* Note that we've already looked at some namespaces during normal
|
|
|
|
|
unqualified lookup, unless we found a decl in function scope. */
|
2000-01-05 12:45:33 +01:00
|
|
|
|
if (fns)
|
|
|
|
|
fn = OVL_CURRENT (fns);
|
|
|
|
|
if (fn && TREE_CODE (fn) == FUNCTION_DECL && DECL_LOCAL_FUNCTION_P (fn))
|
1999-08-14 13:08:53 +02:00
|
|
|
|
k.namespaces = NULL_TREE;
|
|
|
|
|
else
|
|
|
|
|
unqualified_namespace_lookup (name, 0, &k.namespaces);
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
arg_assoc_args (&k, args);
|
|
|
|
|
return k.functions;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Process a namespace-alias declaration. */
|
1994-12-16 03:07:31 +01:00
|
|
|
|
|
|
|
|
|
void
|
1995-05-16 23:10:32 +02:00
|
|
|
|
do_namespace_alias (alias, namespace)
|
|
|
|
|
tree alias, namespace;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
{
|
1998-06-05 04:26:55 +02:00
|
|
|
|
if (TREE_CODE (namespace) != NAMESPACE_DECL)
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
{
|
1998-06-05 04:26:55 +02:00
|
|
|
|
/* The parser did not find it, so it's not there. */
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("unknown namespace `%D'", namespace);
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
return;
|
|
|
|
|
}
|
1998-06-05 04:26:55 +02:00
|
|
|
|
|
|
|
|
|
namespace = ORIGINAL_NAMESPACE (namespace);
|
|
|
|
|
|
1998-07-15 19:27:24 +02:00
|
|
|
|
/* Build the alias. */
|
|
|
|
|
alias = build_lang_decl (NAMESPACE_DECL, alias, void_type_node);
|
|
|
|
|
DECL_NAMESPACE_ALIAS (alias) = namespace;
|
|
|
|
|
pushdecl (alias);
|
1994-12-16 03:07:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-12 17:41:22 +02:00
|
|
|
|
/* Check a non-member using-declaration. Return the name and scope
|
|
|
|
|
being used, and the USING_DECL, or NULL_TREE on failure. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
|
1998-07-12 17:41:22 +02:00
|
|
|
|
static tree
|
|
|
|
|
validate_nonmember_using_decl (decl, scope, name)
|
1995-05-16 23:10:32 +02:00
|
|
|
|
tree decl;
|
1998-07-12 17:41:22 +02:00
|
|
|
|
tree *scope;
|
|
|
|
|
tree *name;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
{
|
2001-08-02 12:51:17 +02:00
|
|
|
|
if (TREE_CODE (decl) == SCOPE_REF)
|
1998-05-08 04:06:26 +02:00
|
|
|
|
{
|
1998-07-12 17:41:22 +02:00
|
|
|
|
*scope = TREE_OPERAND (decl, 0);
|
|
|
|
|
*name = TREE_OPERAND (decl, 1);
|
1998-12-02 11:12:20 +01:00
|
|
|
|
|
2001-08-06 18:04:08 +02:00
|
|
|
|
if (!processing_template_decl)
|
|
|
|
|
{
|
|
|
|
|
/* [namespace.udecl]
|
|
|
|
|
A using-declaration for a class member shall be a
|
|
|
|
|
member-declaration. */
|
|
|
|
|
if(TREE_CODE (*scope) != NAMESPACE_DECL)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_P (*scope))
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%T' is not a namespace", *scope);
|
2001-08-06 18:04:08 +02:00
|
|
|
|
else
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%D' is not a namespace", *scope);
|
2001-08-06 18:04:08 +02:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 7.3.3/5
|
|
|
|
|
A using-declaration shall not name a template-id. */
|
|
|
|
|
if (TREE_CODE (*name) == TEMPLATE_ID_EXPR)
|
|
|
|
|
{
|
|
|
|
|
*name = TREE_OPERAND (*name, 0);
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("a using-declaration cannot specify a template-id. Try `using %D'", *name);
|
2001-08-06 18:04:08 +02:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
}
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
1998-06-04 04:13:29 +02:00
|
|
|
|
else if (TREE_CODE (decl) == IDENTIFIER_NODE
|
1998-11-21 14:42:29 +01:00
|
|
|
|
|| TREE_CODE (decl) == TYPE_DECL
|
|
|
|
|
|| TREE_CODE (decl) == TEMPLATE_DECL)
|
1998-05-08 04:06:26 +02:00
|
|
|
|
{
|
1998-07-12 17:41:22 +02:00
|
|
|
|
*scope = global_namespace;
|
|
|
|
|
*name = decl;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
2001-10-27 16:05:34 +02:00
|
|
|
|
else if (TREE_CODE (decl) == NAMESPACE_DECL)
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("namespace `%D' not allowed in using-declaration", decl);
|
2001-10-27 16:05:34 +02:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
1998-05-08 04:06:26 +02:00
|
|
|
|
else
|
call.c, [...]: Change my_fancy_abort() to abort().
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort().
From-SVN: r49139
2002-01-23 15:26:07 +01:00
|
|
|
|
abort ();
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
if (DECL_P (*name))
|
1998-07-12 17:41:22 +02:00
|
|
|
|
*name = DECL_NAME (*name);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Make a USING_DECL. */
|
1998-07-12 17:41:22 +02:00
|
|
|
|
return push_using_decl (*scope, *name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Process local and global using-declarations. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_nonmember_using_decl (scope, name, oldval, oldtype, newval, newtype)
|
|
|
|
|
tree scope, name;
|
|
|
|
|
tree oldval, oldtype;
|
|
|
|
|
tree *newval, *newtype;
|
|
|
|
|
{
|
|
|
|
|
tree decls;
|
|
|
|
|
|
|
|
|
|
*newval = *newtype = NULL_TREE;
|
1999-09-07 18:07:42 +02:00
|
|
|
|
decls = make_node (CPLUS_BINDING);
|
decl.c (qualify_lookup): New fn.
* decl.c (qualify_lookup): New fn.
(lookup_name_real): Use it.
* decl2.c (add_using_namespace): When directly using a namespace
that was indirect before, promote it.
* cp-tree.h (LOOKUP_PREFER_TYPES, LOOKUP_PREFER_NAMESPACES,
LOOKUP_PREFER_BOTH, LOOKUP_NAMESPACES_ONLY, LOOKUP_TYPES_ONLY,
LOOKUP_QUALIFIERS_ONLY, LOOKUP_TEMPLATES_EXPECTED): New macros.
* decl.c (select_decl): Replace two flag parameters by one.
(unqualified_namespace_lookup): Likewise, pass flag.
(lookup_flags): New function.
(lookup_name_real): Compute flags, pass them.
(lookup_namespace_name): Call with zero-flag.
* decl2.c (ambiguous_decl): Add flag parameter, complain only
according to flags.
(lookup_using_namespace, qualified_lookup_using_namespace):
Add flag parameter, pass them through.
* lex.c (do_scoped_id): Call with zero-flag.
From-SVN: r21218
1998-07-16 18:38:26 +02:00
|
|
|
|
if (!qualified_lookup_using_namespace (name, scope, decls, 0))
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Lookup error */
|
1995-05-16 23:10:32 +02:00
|
|
|
|
return;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (!BINDING_VALUE (decls) && !BINDING_TYPE (decls))
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%D' not declared", name);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check for using functions. */
|
|
|
|
|
if (BINDING_VALUE (decls) && is_overloaded_fn (BINDING_VALUE (decls)))
|
|
|
|
|
{
|
|
|
|
|
tree tmp, tmp1;
|
1998-07-16 23:16:06 +02:00
|
|
|
|
|
|
|
|
|
if (oldval && !is_overloaded_fn (oldval))
|
|
|
|
|
{
|
|
|
|
|
duplicate_decls (OVL_CURRENT (BINDING_VALUE (decls)), oldval);
|
|
|
|
|
oldval = NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-12 17:41:22 +02:00
|
|
|
|
*newval = oldval;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
for (tmp = BINDING_VALUE (decls); tmp; tmp = OVL_NEXT (tmp))
|
|
|
|
|
{
|
1999-01-21 22:16:22 +01:00
|
|
|
|
tree new_fn = OVL_CURRENT (tmp);
|
|
|
|
|
|
|
|
|
|
/* [namespace.udecl]
|
|
|
|
|
|
|
|
|
|
If a function declaration in namespace scope or block
|
|
|
|
|
scope has the same name and the same parameter types as a
|
|
|
|
|
function introduced by a using declaration the program is
|
|
|
|
|
ill-formed. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
for (tmp1 = oldval; tmp1; tmp1 = OVL_NEXT (tmp1))
|
1999-01-21 22:16:22 +01:00
|
|
|
|
{
|
|
|
|
|
tree old_fn = OVL_CURRENT (tmp1);
|
1995-05-16 23:10:32 +02:00
|
|
|
|
|
2001-03-01 14:51:00 +01:00
|
|
|
|
if (new_fn == old_fn)
|
|
|
|
|
/* The function already exists in the current namespace. */
|
|
|
|
|
break;
|
|
|
|
|
else if (OVL_USED (tmp1))
|
|
|
|
|
continue; /* this is a using decl */
|
|
|
|
|
else if (compparms (TYPE_ARG_TYPES (TREE_TYPE (new_fn)),
|
|
|
|
|
TYPE_ARG_TYPES (TREE_TYPE (old_fn))))
|
1999-01-21 22:16:22 +01:00
|
|
|
|
{
|
2002-03-29 21:41:53 +01:00
|
|
|
|
/* If this using declaration introduces a function
|
|
|
|
|
recognized as a built-in, no longer mark it as
|
|
|
|
|
anticipated in this scope. */
|
|
|
|
|
if (DECL_ANTICIPATED (old_fn))
|
|
|
|
|
{
|
|
|
|
|
DECL_ANTICIPATED (old_fn) = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2001-03-01 14:51:00 +01:00
|
|
|
|
/* There was already a non-using declaration in
|
|
|
|
|
this scope with the same parameter types. If both
|
|
|
|
|
are the same extern "C" functions, that's ok. */
|
|
|
|
|
if (!decls_match (new_fn, old_fn))
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%D' is already declared in this scope", name);
|
1999-01-21 22:16:22 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we broke out of the loop, there's no reason to add
|
|
|
|
|
this function to the using declarations for this
|
|
|
|
|
scope. */
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (tmp1)
|
|
|
|
|
continue;
|
|
|
|
|
|
1998-07-12 17:41:22 +02:00
|
|
|
|
*newval = build_overload (OVL_CURRENT (tmp), *newval);
|
|
|
|
|
if (TREE_CODE (*newval) != OVERLOAD)
|
|
|
|
|
*newval = ovl_cons (*newval, NULL_TREE);
|
|
|
|
|
OVL_USED (*newval) = 1;
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
1995-05-16 23:10:32 +02:00
|
|
|
|
{
|
1998-07-12 17:41:22 +02:00
|
|
|
|
*newval = BINDING_VALUE (decls);
|
1998-07-16 23:16:06 +02:00
|
|
|
|
if (oldval)
|
|
|
|
|
duplicate_decls (*newval, oldval);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-12 17:41:22 +02:00
|
|
|
|
*newtype = BINDING_TYPE (decls);
|
|
|
|
|
if (oldtype && *newtype && oldtype != *newtype)
|
1998-05-08 04:06:26 +02:00
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("using declaration `%D' introduced ambiguous type `%T'",
|
1998-07-12 17:41:22 +02:00
|
|
|
|
name, oldtype);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return;
|
1995-05-16 23:10:32 +02:00
|
|
|
|
}
|
1998-07-12 17:41:22 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Process a using-declaration not appearing in class or local scope. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
do_toplevel_using_decl (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
|
|
|
|
tree scope, name, binding;
|
|
|
|
|
tree oldval, oldtype, newval, newtype;
|
|
|
|
|
|
|
|
|
|
decl = validate_nonmember_using_decl (decl, &scope, &name);
|
|
|
|
|
if (decl == NULL_TREE)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
binding = binding_for_name (name, current_namespace);
|
|
|
|
|
|
|
|
|
|
oldval = BINDING_VALUE (binding);
|
|
|
|
|
oldtype = BINDING_TYPE (binding);
|
|
|
|
|
|
|
|
|
|
do_nonmember_using_decl (scope, name, oldval, oldtype, &newval, &newtype);
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Copy declarations found. */
|
|
|
|
|
if (newval)
|
|
|
|
|
BINDING_VALUE (binding) = newval;
|
|
|
|
|
if (newtype)
|
|
|
|
|
BINDING_TYPE (binding) = newtype;
|
|
|
|
|
return;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-16 23:16:06 +02:00
|
|
|
|
/* Process a using-declaration at function scope. */
|
|
|
|
|
|
1998-07-12 17:41:22 +02:00
|
|
|
|
void
|
|
|
|
|
do_local_using_decl (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
|
|
|
|
tree scope, name;
|
|
|
|
|
tree oldval, oldtype, newval, newtype;
|
1998-07-16 23:16:06 +02:00
|
|
|
|
|
1998-07-12 17:41:22 +02:00
|
|
|
|
decl = validate_nonmember_using_decl (decl, &scope, &name);
|
|
|
|
|
if (decl == NULL_TREE)
|
|
|
|
|
return;
|
|
|
|
|
|
2001-03-01 15:01:39 +01:00
|
|
|
|
if (building_stmt_tree ()
|
|
|
|
|
&& at_function_scope_p ())
|
|
|
|
|
add_decl_stmt (decl);
|
|
|
|
|
|
1998-07-16 23:16:06 +02:00
|
|
|
|
oldval = lookup_name_current_level (name);
|
|
|
|
|
oldtype = lookup_type_current_level (name);
|
1998-07-12 17:41:22 +02:00
|
|
|
|
|
|
|
|
|
do_nonmember_using_decl (scope, name, oldval, oldtype, &newval, &newtype);
|
|
|
|
|
|
|
|
|
|
if (newval)
|
1999-01-21 22:16:22 +01:00
|
|
|
|
{
|
|
|
|
|
if (is_overloaded_fn (newval))
|
|
|
|
|
{
|
1999-03-03 12:22:42 +01:00
|
|
|
|
tree fn, term;
|
1999-01-21 22:16:22 +01:00
|
|
|
|
|
|
|
|
|
/* We only need to push declarations for those functions
|
1999-03-03 12:22:42 +01:00
|
|
|
|
that were not already bound in the current level.
|
|
|
|
|
The old value might be NULL_TREE, it might be a single
|
|
|
|
|
function, or an OVERLOAD. */
|
|
|
|
|
if (oldval && TREE_CODE (oldval) == OVERLOAD)
|
|
|
|
|
term = OVL_FUNCTION (oldval);
|
|
|
|
|
else
|
|
|
|
|
term = oldval;
|
|
|
|
|
for (fn = newval; fn && OVL_CURRENT (fn) != term;
|
|
|
|
|
fn = OVL_NEXT (fn))
|
1999-01-21 22:16:22 +01:00
|
|
|
|
push_overloaded_decl (OVL_CURRENT (fn),
|
|
|
|
|
PUSH_LOCAL | PUSH_USING);
|
|
|
|
|
}
|
|
|
|
|
else
|
1999-01-26 03:33:46 +01:00
|
|
|
|
push_local_binding (name, newval, PUSH_USING);
|
1999-01-21 22:16:22 +01:00
|
|
|
|
}
|
1998-07-16 23:16:06 +02:00
|
|
|
|
if (newtype)
|
|
|
|
|
set_identifier_type_value (name, newtype);
|
1998-07-12 17:41:22 +02:00
|
|
|
|
}
|
|
|
|
|
|
1994-12-16 03:07:31 +01:00
|
|
|
|
tree
|
1995-05-16 23:10:32 +02:00
|
|
|
|
do_class_using_decl (decl)
|
1994-12-16 03:07:31 +01:00
|
|
|
|
tree decl;
|
|
|
|
|
{
|
1996-02-20 21:35:10 +01:00
|
|
|
|
tree name, value;
|
1995-10-12 03:33:51 +01:00
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (TREE_CODE (decl) != SCOPE_REF
|
builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.
* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
c_get_alias_set): Likewise.
* c-decl.c (duplicate_decls): Likewise.
* c-typeck.c (default_conversion,build_unary_op): Likewise.
* calls.c (initialize_argument_information): Likewise.
* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
Likewise.
* dwarfout.c (decl_class_context,output_type): Likewise.
* expr.c (get_inner_reference): Likewise.
* fold-const.c (simple_operand_p,fold): Likewise.
* function.c (aggregate_value_p): Likewise.
* stmt.c (expand_asm_operands): Likewise.
* varasm.c (named_section): Likewise.
* call.c (check_dtor_name,build_new_method_call): Likewise.
* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
decl_namespace,arg_assoc_template_arg,arg_assoc,
validate_nonmember_using_decl,do_class_using_decl): Likewise.
* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
args_to_string): Likewise.
* friend.c (is_friend): Likewise.
* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
* method.c (build_overload_nested_name,build_overload_value,
build_qualified_name,build_qualified_name,hack_identifier): Likewise.
* parse.y (typename_sub,typename_sub1): Likewise.
* pt.c (push_inline_template_parms_recursive,check_template_shadow,
process_partial_specialization,convert_template_argument,
template_args_equal,add_pending_template,lookup_template_class,
for_each_template_parm_r,maybe_fold_nontype_arg,
tsubst,instantiate_template,type_unification_real,unify,
instantiate_pending_templates,set_mangled_name_for_template_decl):
Likewise.
* repo.c (repo_get_id,repo_template_used): Likewise.
* search.c (lookup_field_1): Likewise.
* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
* xref.c (classname): Likewise.
From-SVN: r32698
2000-03-23 01:41:05 +01:00
|
|
|
|
|| !TYPE_P (TREE_OPERAND (decl, 0)))
|
1996-02-20 21:35:10 +01:00
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("using-declaration for non-member at class scope");
|
1996-02-20 21:35:10 +01:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
name = TREE_OPERAND (decl, 1);
|
|
|
|
|
if (TREE_CODE (name) == BIT_NOT_EXPR)
|
|
|
|
|
{
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("using-declaration for destructor");
|
1996-02-20 21:35:10 +01:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
2001-08-06 18:04:08 +02:00
|
|
|
|
else if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
|
|
|
|
|
{
|
|
|
|
|
name = TREE_OPERAND (name, 0);
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("a using-declaration cannot specify a template-id. Try `using %T::%D'", TREE_OPERAND (decl, 0), name);
|
2001-08-06 18:04:08 +02:00
|
|
|
|
return NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
if (TREE_CODE (name) == TYPE_DECL || TREE_CODE (name) == TEMPLATE_DECL)
|
1998-07-16 19:48:39 +02:00
|
|
|
|
name = DECL_NAME (name);
|
|
|
|
|
|
|
|
|
|
my_friendly_assert (TREE_CODE (name) == IDENTIFIER_NODE, 980716);
|
1996-02-20 21:35:10 +01:00
|
|
|
|
|
1999-08-18 22:44:14 +02:00
|
|
|
|
value = build_lang_decl (USING_DECL, name, void_type_node);
|
1996-02-20 21:35:10 +01:00
|
|
|
|
DECL_INITIAL (value) = TREE_OPERAND (decl, 0);
|
|
|
|
|
return value;
|
1994-12-16 03:07:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-05-08 04:06:26 +02:00
|
|
|
|
/* Process a using-directive. */
|
|
|
|
|
|
1994-12-16 03:07:31 +01:00
|
|
|
|
void
|
|
|
|
|
do_using_directive (namespace)
|
|
|
|
|
tree namespace;
|
|
|
|
|
{
|
2001-05-03 13:02:26 +02:00
|
|
|
|
if (building_stmt_tree ())
|
|
|
|
|
add_stmt (build_stmt (USING_STMT, namespace));
|
2001-05-01 14:56:12 +02:00
|
|
|
|
|
1998-06-05 04:26:55 +02:00
|
|
|
|
/* using namespace A::B::C; */
|
Partial implementation of namespaces.
* decl.c (push_namespace): Handle redeclaration error.
* cp-tree.h (IDENTIFIER_NAMESPACE_VALUE): New macro.
(IDENTIFIER_NAMESPACE_BINDINGS): New macro.
(NAMESPACE_BINDING): New macro.
(IDENTIFIER_GLOBAL_VALUE): Use NAMESPACE_BINDING.
* *.c: Use them.
* pt.c (push_template_decl): Use innermost_args.
* decl.c (get_unique_name): Tweak from earlier in the name.
* cp-tree.def: Add CPLUS_BINDING node.
* cp-tree.h (tree_binding): new struct
(BINDING_SCOPE, BINDING_VALUE): new macros
(current_namespace, global_namespace): declare extern
(struct lang_decl_flags): new field in_namespace
(DECL_NAMESPACE_USING, DECL_NAMESPACE_USERS): new macros
(DECL_NAMESPACE, SET_DECL_NAMESPACE): new macros
(TREE_INDIRECT_USING): new macro
* decl2.c (current_namespace, global_namespace): Declare. The
value is a NAMESPACE_DECL now, not a TREE_LIST.
(is_namespace_ancestor, namespace_ancestor):new static functions.
(add_using_namespace, ambiguous_decl): likewise.
(lookup_using_namespace): new support function for lookup_name.
(qualified_lookup_using_namespace): new support function for
do_scoped_id and lookup_namespace_name
(get_namespace_id): mark as obsolete.
(current_namespace_id): Likewise.
(do_namespace_alias): Implement.
(do_using_directive): Implement as call to add_using_namespace.
* decl.c (binding_for_name): new function.
(push_namespace, pop_namespace): implement.
(push_decl): don't install a FUNCTION_DECL in the global branch.
(lookup_namespace_name): implement using qualified lookup.
(lookup_name_real): For global scoping, lookup in
global_namespace. For namespace scoping, lookup in given
namespace. For unscoped lookup, iterate over namespace,
considering using directives.
(init_decl_processing): initialize global_namespace.
(grokvardecl): Build assembler name as static name for globals.
(grokdeclarator): Remove old namespace mangling.
(xref_tag): When installing a global binding for the
tag, make sure we have an identifier.
* method.c (build_overload_nested_name): mangle namespaces.
(build_qualified_name): Likewise.
(build_decl_overload_real): Likewise.
* lex.c (build_lang_decl): set namespace for new declaration to
current_namespace.
(do_scoped_id): find global names in global or current
namespace, or using qualified namespace lookup, depending on
context.
* init.c (build_member_call): When scope is namespace, use
build_x_function_call instead.
(build_offset_ref): When scope is namespace, collapse processing
to lookup_namespace_name instead.
* error.c (dump_decl): Support NAMESPACE_DECL.
* decl.c (pushdecl): Bind globals to current namespace.
(push_overloaded_decl): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(xref_tag): Likewise.
(start_function): Likewise.
* lex.c (do_identifier): Likewise.
(identifier_typedecl_value): Likewise.
(real_yylex): Likewise.
* method.c (do_inline_function_hair): Likewise.
* parse.y (unscoped): Likewise.
* pt.c (check_explicit_specialization): Likewise.
(lookup_template_class): Likewise.
* rtti.c (call_void_fn): Likewise.
* sig.c (build_sigtable): Likewise.
* ptree.c (lang_print_xnode): New function.
From-SVN: r18227
1998-02-25 01:49:51 +01:00
|
|
|
|
if (TREE_CODE (namespace) == SCOPE_REF)
|
|
|
|
|
namespace = TREE_OPERAND (namespace, 1);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (TREE_CODE (namespace) == IDENTIFIER_NODE)
|
|
|
|
|
{
|
|
|
|
|
/* Lookup in lexer did not find a namespace. */
|
2001-05-01 14:56:12 +02:00
|
|
|
|
if (!processing_template_decl)
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("namespace `%T' undeclared", namespace);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (TREE_CODE (namespace) != NAMESPACE_DECL)
|
|
|
|
|
{
|
2001-05-01 14:56:12 +02:00
|
|
|
|
if (!processing_template_decl)
|
cp-tree.h: Delete #defines for cp_error, cp_warning, cp_pedwarn, and cp_compiler_error.
* cp-tree.h: Delete #defines for cp_error, cp_warning,
cp_pedwarn, and cp_compiler_error.
* call.c, class.c, cp-tree.h, cvt.c, decl.c, decl2.c, error.c,
except.c, friend.c, init.c, lex.c, method.c, parse.y, pt.c,
rtti.c, search.c, semantics.c, spew.c, tree.c, typeck.c,
typeck2.c: Change calls to the above macros to use their
language-independent equivalents: error, warning, pedwarn, and
internal_error respectively.
From-SVN: r48140
2001-12-18 04:35:42 +01:00
|
|
|
|
error ("`%T' is not a namespace", namespace);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
1998-06-05 04:26:55 +02:00
|
|
|
|
namespace = ORIGINAL_NAMESPACE (namespace);
|
1998-07-12 17:41:22 +02:00
|
|
|
|
if (!toplevel_bindings_p ())
|
1998-07-16 23:16:06 +02:00
|
|
|
|
push_using_directive (namespace);
|
1998-07-12 17:41:22 +02:00
|
|
|
|
else
|
|
|
|
|
/* direct usage */
|
|
|
|
|
add_using_namespace (current_namespace, namespace, 0);
|
1994-12-16 03:07:31 +01:00
|
|
|
|
}
|
1995-10-12 03:33:51 +01:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
check_default_args (x)
|
|
|
|
|
tree x;
|
|
|
|
|
{
|
|
|
|
|
tree arg = TYPE_ARG_TYPES (TREE_TYPE (x));
|
|
|
|
|
int saw_def = 0, i = 0 - (TREE_CODE (TREE_TYPE (x)) == METHOD_TYPE);
|
|
|
|
|
for (; arg && arg != void_list_node; arg = TREE_CHAIN (arg), ++i)
|
|
|
|
|
{
|
|
|
|
|
if (TREE_PURPOSE (arg))
|
|
|
|
|
saw_def = 1;
|
|
|
|
|
else if (saw_def)
|
|
|
|
|
{
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_error_at ("default argument missing for parameter %P of `%+#D'",
|
1998-05-28 03:44:29 +02:00
|
|
|
|
i, x);
|
1995-10-12 03:33:51 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
1995-12-19 07:51:14 +01:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
mark_used (decl)
|
|
|
|
|
tree decl;
|
|
|
|
|
{
|
|
|
|
|
TREE_USED (decl) = 1;
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (processing_template_decl)
|
1996-02-28 23:01:56 +01:00
|
|
|
|
return;
|
1995-12-19 07:51:14 +01:00
|
|
|
|
assemble_external (decl);
|
cp-tree.h (TI_USES_TEMPLATE_PARMS): Remove.
* cp-tree.h (TI_USES_TEMPLATE_PARMS): Remove.
(build_template_decl_overload): Remove.
(set_mangled_name_for_decl): New function.
(innermost_args): Remove is_spec parameter.
(most_specialized, most_specialized_class): Remove declarations.
(lookup_template_class): Add entering_scope parameter.
(maybe_process_partial_specialization): New function.
(finish_template_decl): Likewise.
(finish_template_type): Likewise.
* class.c (finish_struct): Clean up processing of member template
specializations.
* decl.c (pushtag): Fix formatting.
(lookup_tag): Improve handling of pseudo-global levels.
(make_typename_type): Adjust call to lookup_template_class.
(shadow_tag): Use maybe_process_partial_specialization.
(xref_tag): Improve handling of member friends.
(start_function): Call push_nested_class before
push_template_decl. Don't call push_template_decl for
specializations.
* decl2.c (grok_x_components): Don't call xref_tag for
template instantiations. Handle UNION_TYPEs like RECORD_TYPEs.
(grokclassfn): Use set_mangled_name_for_decl.
(arg_assoc_class): Adjust call to innermost_args.
(mark_used): Don't call instantiate_decl for a TEMPLATE_DECL.
* error.c (dump_function_name): Improve printing of template
function names.
* friend.c (is_friend): Don't compare types of decls to determine
friendship, unless flag_guiding_decls.
(make_friend_class): Partial specializations cannot be friends.
(do_friend): Use set_mangled_name_for_decl. Call
push_template_decl_real instead of push_template_decl.
* method.c (build_decl_overload_real): Remove prototype. Give it
external linkage.
(build_overload_identififer): Adjust call to innermost_args.
(build_template_decl_overload): Remove.
(set_mangled_name_for_decl): New function.
* parse.y (.finish_template_type): New non-terminal.
(template_def): Use finish_template_decl. Use template_extdef
instead of extdef.
(template_extdef, template_datadef): New non-terminals, containing
only those rules for things which can be templates.
(datadef): Tidy.
(template_type, self_template_type): Use .finish_template_type.
(named_class_head): Use maybe_process_partial_specialization.
* pt.c (mangle_class_name_for_template): Remove context parameter.
(get_class_bindings): Remove outer_args parameter.
(complete_template_args): Remove.
(add_outermost_template_args): New function.
(register_specialization): Return the specialization.
(unregister_specialization): New function.
(tsubst_template_parms): Likewise.
(most_specialized, most_specialized_class): Prototype here as
static.
(original_template): Rename to most_general_template.
(tsubst_template_parms): New function.
(set_mangled_name_for_template_decl): Likewise.
(TMPL_ARGS_DEPTH): New macro.
(TMPL_ARGS_HAVE_MULTIPLE_LEVELS): Adjust.
(TMPL_ARGS_LEVEL): New macro.
(SET_TMPL_ARGS_LEVEL): Likewise.
(TMPL_ARG): Likewise.
(SET_TMPL_ARG): Likewise.
(TMPL_ARGS_DEPTH): Likewise.
(finish_member_template_decl): Use finish_template_decl.
(maybe_process_partial_specialization): New function, split out
from tsubst.
(inline_needs_template_parms): Use TMPL_PARMS_DEPTH.
(maybe_begin_member_template_processing): Use new macros.
(is_member_template): Likewise.
(is_member_template_class): Likewise.
(add_to_template_args): Likewise. Deal with multiple levels of
args.
(maybe_process_partial_specialization): New function.
(retrieve_specialization): Add consistency check.
(determine_specialization): Return full argument list.
(check_explicit_specialization): Tweak friend handling. Use full
argument lists. Simplify.
(current_template_args): Use new macros.
(push_template_decl_real): Change ill-named mainargs to specargs.
Check that a partial specialization actually specializes at least
one parameter. Improve friend handling. Modify for full
template arguments.
(classtype_mangled_name): Don't mangle the names of
specializations.
(lookup_template_class): Add entering_scope parameter. Use it to
avoid finding a template type when an instantiation is required.
Simplify. Use full template arguments.
(tsubst_friend_function): Use unregister_specialization. Use new
macros. Use full template arguments.
(tsubst_friend_class): Substitute, using tsubst_template_parms,
into the template parameters before passing them to
redeclare_class_template.
(instantiate_class_template): Simplify. Use full template
arguments. Adjust calls to get_class_bindings. Use
SET_IDENTIFIER_TYPE_VALUE where needed. Improve friend handling.
(innermost_args): Use new macros.
(tsubst_aggr_type): New function, split out from tsubst.
(tsubst): Use tsubst_aggr_type, tsubst_template_parms, new calling
conventions for lookup_tmeplate_class. Refine handling of partial
instantiations. Remove calls to complete_template_args.
Simplify. Add consistency checks. Use set_mangled_name_for_decl
and set_mangled_name_for_template_decl.
(tsubst_copy): Use tsubst_aggr_type.
(instantiate_template): Use full template arguments.
(more_specialized): Improve formatting.
(more_specialized_class): Adjust calls to get_class_bindings.
(get_bindings_real): Don't call complete_template_args.
(most_specialized): Don't overwrite input; create a new list.
(most_specialized_class): Use most_general_template.
(regenerate_decl_from_template): Use unregister_specialization.
Use full template arguments.
(instantiate_decl): Use full template arguments.
(set_mangled_name_for_template_decl): New function.
* semantics.c (begin_class_definition): Use
maybe_process_partial_specialization.
(finish_member_class_template): New function.
(finish_template_decl): Likewise.
(finish_template_type): Likewise.
(typeck.c): Don't crash after issuing a compiler_error.
* Makefile.in (CONFLICTS): Adjust; we removed a s/r conflict.
From-SVN: r21433
1998-07-28 03:03:16 +02:00
|
|
|
|
|
1996-08-13 17:39:22 +02:00
|
|
|
|
/* Is it a synthesized method that needs to be synthesized? */
|
Make DECL_CONTEXT mean the class in which a member function was declared, even for a virtual function.
Make DECL_CONTEXT mean the class in which a member function was
declared, even for a virtual function.
* cp-tree.h (DECL_CLASS_CONTEXT): Adjust.
(DECL_FRIEND_CONTEXT): New macro.
(DECL_REAL_CONTEXT): Remove.
(SET_DECL_FRIEND_CONTEXT): Likewise.
(DECL_VIRTUAL_CONTEXT): Adjust.
(DECL_CLASS_SCOPE_P): Use TYPE_P.
(add_friends): Remove.
(hack_decl_function_context): Likewise.
* call.c (build_new_function_call): Replace DECL_REAL_CONTEXT with
CP_DECL_CONTEXT.
(build_over_call): Fix indentation. Use DECL_CONTEXT
instead of DECL_CLASS_CONTEXT.
* class.c (dfs_build_vcall_offset_vtbl_entries): Likewise.
(add_method): Set DECL_VIRTUAL_CONTEXT, not DECL_CLASS_CONTEXT.
(strictly_overrides): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(build_vtbl_or_vbase_field): Don't set DECL_CLASS_CONTEXT.
(build_base_field): Likewise.
(finish_struct_1): Likewise.
(build_self_reference): Likewise.
* decl.c (push_class_binding): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(pushtag): Use decl_function_context, not
hack_decl_function_context.
(decls_match): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
(duplicate_decls): Use DECL_VIRTUAL_CONTEXT.
(pushdecl): Remove bogus code.
(start_decl): Use DECL_CONTEXT rather than DECL_CLASS_CONTEXT.
(cp_finish_decl): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
(grokfndecl): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
Use decl_function_context, nothack_decl_function_context.
(grokvardecl): Don't set DECL_CLASS_CONTEXT.
(grokdeclarator): Likewise. Use decl_function_context, not
hack_decl_function_context.
(copy_args_p): Document. Don't use DECL_CLASS_CONTEXT.
(start_function): Use DECL_FRIEND_CONTEXT, not
DECL_CLASS_CONTEXT. Use decl_function_context, not
hack_decl_function_context.
(finish_function): Use decl_function_context, not
hack_decl_function_context.
(maybe_retrofit_in_chrg): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
(grokclassfn): Set DECL_VIRTUAL_CONTEXT, not DECL_CONTEXT.
(finish_static_data_member_decl): Don't set DECL_CLASS_CONTEXT.
(grokfield): Likewise.
(finish_builtin_type): Likewise.
(finish_vtable_vardec): Use decl_function_context, not
hack_decl_function_context.
(import_export_decl): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(start_static_initialization_or_destruction): Likewise.
(finish_static_initialization_or_destruction): Likewise.
(mark_used): Adjust logic for deciding when to synthesize methods.
* dump.c (dequeue_and_dump): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
* error.c (dump_function_decl): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* friend.c (is_friend): Likewise.
(add_friends): Remove.
(do_friend): Use SET_DECL_FRIEND_CONTEXT.
* lex.c (begin_definition_of_inclass_inline): Use
decl_function_context, not hack_decl_function_context.
(process_next_inline): Likewise.
(do_identifier): Use CP_DECL_CONTEXT, not DECL_REAL_CONTEXT.
* method.c (set_mangled_name_for_decl): Use DECL_CONTEXT, not
DECL_CLASSS_CONTEXT.
(hack_identifier): Likewise.
(synthesize_method): Use decl_function_context, not
hack_decl_function_context.
* pt.c (template_class_depth_real): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(is_member_template): Use decl_function_context, not
hack_decl_function_context. Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
(build_template_decl): Set DECL_VIRTUAL_CONTEXT, not
DECL_CLASS_CONTEXT.
(check_default_tmpl_args): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(push_template_decl_real): Likewise.
(instantiate_class_template): Don't call add_friends.
(tsubst_default_argument): Use DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(tsubst_decl): Set DECL_VIRTUAL_CONTEXT, not DECL_CLASS_CONTEXT.
Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(set_meangled_name_for_template_decl): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* repo.c (repo_inline_used): Likewise.
* search.c (current_scope): Adjust for new _CONTEXT macros.
(context_for_name_lookup): Use CP_DECL_CONTEXT, not
DECL_REAL_CONTEXT.
(friend_accessible_p): Use DECL_CONTEXT, not DECL_CLASS_CONTEXT.
(lookup_fnfields_here):Likewise.
(check_final_overrider): Likewise.
(init_vbase_pointers): Likewise.
(virtual_context): Likewise.
* semantics.c (finish_member_declaration): Just set DECL_CONTEXT.
(expand_body): Use decl_function_context, not
hack_decl_function_context.
* tree.c (hack_decl_function_context): Remove.
* typeck.c (build_x_function_call): Use DECL_CONTEXT, not
DECL_CLASS_CONTEXT.
* typeck2.c (error_not_base_type): Likewise.
From-SVN: r32018
2000-02-17 00:54:23 +01:00
|
|
|
|
if (TREE_CODE (decl) == FUNCTION_DECL
|
|
|
|
|
&& DECL_NONSTATIC_MEMBER_FUNCTION_P (decl)
|
|
|
|
|
&& DECL_ARTIFICIAL (decl)
|
|
|
|
|
&& ! DECL_INITIAL (decl)
|
1996-08-13 17:39:22 +02:00
|
|
|
|
/* Kludge: don't synthesize for default args. */
|
|
|
|
|
&& current_function_decl)
|
2000-04-11 22:16:36 +02:00
|
|
|
|
{
|
|
|
|
|
synthesize_method (decl);
|
|
|
|
|
/* If we've already synthesized the method we don't need to
|
|
|
|
|
instantiate it, so we can return right away. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
cp-tree.h (TI_USES_TEMPLATE_PARMS): Remove.
* cp-tree.h (TI_USES_TEMPLATE_PARMS): Remove.
(build_template_decl_overload): Remove.
(set_mangled_name_for_decl): New function.
(innermost_args): Remove is_spec parameter.
(most_specialized, most_specialized_class): Remove declarations.
(lookup_template_class): Add entering_scope parameter.
(maybe_process_partial_specialization): New function.
(finish_template_decl): Likewise.
(finish_template_type): Likewise.
* class.c (finish_struct): Clean up processing of member template
specializations.
* decl.c (pushtag): Fix formatting.
(lookup_tag): Improve handling of pseudo-global levels.
(make_typename_type): Adjust call to lookup_template_class.
(shadow_tag): Use maybe_process_partial_specialization.
(xref_tag): Improve handling of member friends.
(start_function): Call push_nested_class before
push_template_decl. Don't call push_template_decl for
specializations.
* decl2.c (grok_x_components): Don't call xref_tag for
template instantiations. Handle UNION_TYPEs like RECORD_TYPEs.
(grokclassfn): Use set_mangled_name_for_decl.
(arg_assoc_class): Adjust call to innermost_args.
(mark_used): Don't call instantiate_decl for a TEMPLATE_DECL.
* error.c (dump_function_name): Improve printing of template
function names.
* friend.c (is_friend): Don't compare types of decls to determine
friendship, unless flag_guiding_decls.
(make_friend_class): Partial specializations cannot be friends.
(do_friend): Use set_mangled_name_for_decl. Call
push_template_decl_real instead of push_template_decl.
* method.c (build_decl_overload_real): Remove prototype. Give it
external linkage.
(build_overload_identififer): Adjust call to innermost_args.
(build_template_decl_overload): Remove.
(set_mangled_name_for_decl): New function.
* parse.y (.finish_template_type): New non-terminal.
(template_def): Use finish_template_decl. Use template_extdef
instead of extdef.
(template_extdef, template_datadef): New non-terminals, containing
only those rules for things which can be templates.
(datadef): Tidy.
(template_type, self_template_type): Use .finish_template_type.
(named_class_head): Use maybe_process_partial_specialization.
* pt.c (mangle_class_name_for_template): Remove context parameter.
(get_class_bindings): Remove outer_args parameter.
(complete_template_args): Remove.
(add_outermost_template_args): New function.
(register_specialization): Return the specialization.
(unregister_specialization): New function.
(tsubst_template_parms): Likewise.
(most_specialized, most_specialized_class): Prototype here as
static.
(original_template): Rename to most_general_template.
(tsubst_template_parms): New function.
(set_mangled_name_for_template_decl): Likewise.
(TMPL_ARGS_DEPTH): New macro.
(TMPL_ARGS_HAVE_MULTIPLE_LEVELS): Adjust.
(TMPL_ARGS_LEVEL): New macro.
(SET_TMPL_ARGS_LEVEL): Likewise.
(TMPL_ARG): Likewise.
(SET_TMPL_ARG): Likewise.
(TMPL_ARGS_DEPTH): Likewise.
(finish_member_template_decl): Use finish_template_decl.
(maybe_process_partial_specialization): New function, split out
from tsubst.
(inline_needs_template_parms): Use TMPL_PARMS_DEPTH.
(maybe_begin_member_template_processing): Use new macros.
(is_member_template): Likewise.
(is_member_template_class): Likewise.
(add_to_template_args): Likewise. Deal with multiple levels of
args.
(maybe_process_partial_specialization): New function.
(retrieve_specialization): Add consistency check.
(determine_specialization): Return full argument list.
(check_explicit_specialization): Tweak friend handling. Use full
argument lists. Simplify.
(current_template_args): Use new macros.
(push_template_decl_real): Change ill-named mainargs to specargs.
Check that a partial specialization actually specializes at least
one parameter. Improve friend handling. Modify for full
template arguments.
(classtype_mangled_name): Don't mangle the names of
specializations.
(lookup_template_class): Add entering_scope parameter. Use it to
avoid finding a template type when an instantiation is required.
Simplify. Use full template arguments.
(tsubst_friend_function): Use unregister_specialization. Use new
macros. Use full template arguments.
(tsubst_friend_class): Substitute, using tsubst_template_parms,
into the template parameters before passing them to
redeclare_class_template.
(instantiate_class_template): Simplify. Use full template
arguments. Adjust calls to get_class_bindings. Use
SET_IDENTIFIER_TYPE_VALUE where needed. Improve friend handling.
(innermost_args): Use new macros.
(tsubst_aggr_type): New function, split out from tsubst.
(tsubst): Use tsubst_aggr_type, tsubst_template_parms, new calling
conventions for lookup_tmeplate_class. Refine handling of partial
instantiations. Remove calls to complete_template_args.
Simplify. Add consistency checks. Use set_mangled_name_for_decl
and set_mangled_name_for_template_decl.
(tsubst_copy): Use tsubst_aggr_type.
(instantiate_template): Use full template arguments.
(more_specialized): Improve formatting.
(more_specialized_class): Adjust calls to get_class_bindings.
(get_bindings_real): Don't call complete_template_args.
(most_specialized): Don't overwrite input; create a new list.
(most_specialized_class): Use most_general_template.
(regenerate_decl_from_template): Use unregister_specialization.
Use full template arguments.
(instantiate_decl): Use full template arguments.
(set_mangled_name_for_template_decl): New function.
* semantics.c (begin_class_definition): Use
maybe_process_partial_specialization.
(finish_member_class_template): New function.
(finish_template_decl): Likewise.
(finish_template_type): Likewise.
(typeck.c): Don't crash after issuing a compiler_error.
* Makefile.in (CONFLICTS): Adjust; we removed a s/r conflict.
From-SVN: r21433
1998-07-28 03:03:16 +02:00
|
|
|
|
|
|
|
|
|
/* If this is a function or variable that is an instance of some
|
|
|
|
|
template, we now know that we will need to actually do the
|
1999-11-06 00:11:58 +01:00
|
|
|
|
instantiation. We check that DECL is not an explicit
|
1998-08-23 14:47:24 +02:00
|
|
|
|
instantiation because that is not checked in instantiate_decl. */
|
2000-05-04 16:54:18 +02:00
|
|
|
|
if ((DECL_NON_THUNK_FUNCTION_P (decl) || TREE_CODE (decl) == VAR_DECL)
|
1998-08-23 14:47:24 +02:00
|
|
|
|
&& DECL_LANG_SPECIFIC (decl) && DECL_TEMPLATE_INFO (decl)
|
2000-01-25 06:53:12 +01:00
|
|
|
|
&& (!DECL_EXPLICIT_INSTANTIATION (decl)
|
|
|
|
|
|| (TREE_CODE (decl) == FUNCTION_DECL && DECL_INLINE (decl))))
|
2000-04-06 05:12:19 +02:00
|
|
|
|
instantiate_decl (decl, /*defer_ok=*/1);
|
1995-12-19 07:51:14 +01:00
|
|
|
|
}
|
1997-08-20 00:49:24 +02:00
|
|
|
|
|
2002-01-02 12:37:00 +01:00
|
|
|
|
/* Helper function for class_head_decl and class_head_defn
|
|
|
|
|
nonterminals. AGGR is the class, union or struct tag. SCOPE is the
|
|
|
|
|
explicit scope used (NULL for no scope resolution). ID is the
|
|
|
|
|
name. DEFN_P is true, if this is a definition of the class and
|
|
|
|
|
NEW_TYPE_P is set to non-zero, if we push into the scope containing
|
|
|
|
|
the to be defined aggregate.
|
|
|
|
|
|
|
|
|
|
Return a TYPE_DECL for the type declared by ID in SCOPE. */
|
1997-08-20 00:49:24 +02:00
|
|
|
|
|
|
|
|
|
tree
|
2002-06-26 19:03:44 +02:00
|
|
|
|
handle_class_head (tag_kind, scope, id, attributes, defn_p, new_type_p)
|
|
|
|
|
enum tag_types tag_kind;
|
|
|
|
|
tree scope, id, attributes;
|
2002-01-02 12:37:00 +01:00
|
|
|
|
int defn_p;
|
|
|
|
|
int *new_type_p;
|
1997-08-20 00:49:24 +02:00
|
|
|
|
{
|
2000-09-13 03:02:52 +02:00
|
|
|
|
tree decl = NULL_TREE;
|
2002-01-02 12:37:00 +01:00
|
|
|
|
tree current = current_scope ();
|
|
|
|
|
bool xrefd_p = false;
|
1999-08-25 14:04:47 +02:00
|
|
|
|
|
2002-01-02 12:37:00 +01:00
|
|
|
|
if (current == NULL_TREE)
|
|
|
|
|
current = current_namespace;
|
2000-09-13 03:02:52 +02:00
|
|
|
|
|
2002-01-02 12:37:00 +01:00
|
|
|
|
*new_type_p = 0;
|
|
|
|
|
|
|
|
|
|
if (scope)
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (id) == TYPE_DECL)
|
|
|
|
|
/* We must bash typedefs back to the main decl of the
|
|
|
|
|
type. Otherwise we become confused about scopes. */
|
|
|
|
|
decl = TYPE_MAIN_DECL (TREE_TYPE (id));
|
|
|
|
|
else if (DECL_CLASS_TEMPLATE_P (id))
|
|
|
|
|
decl = DECL_TEMPLATE_RESULT (id);
|
|
|
|
|
else
|
2000-09-13 03:02:52 +02:00
|
|
|
|
{
|
2002-01-02 12:37:00 +01:00
|
|
|
|
if (TYPE_P (scope))
|
|
|
|
|
{
|
|
|
|
|
/* According to the suggested resolution of core issue
|
|
|
|
|
180, 'typename' is assumed after a class-key. */
|
2002-02-22 12:57:52 +01:00
|
|
|
|
decl = make_typename_type (scope, id, tf_error);
|
2002-01-02 12:37:00 +01:00
|
|
|
|
if (decl != error_mark_node)
|
|
|
|
|
decl = TYPE_MAIN_DECL (decl);
|
|
|
|
|
else
|
|
|
|
|
decl = NULL_TREE;
|
|
|
|
|
}
|
|
|
|
|
else if (scope == current)
|
|
|
|
|
{
|
|
|
|
|
/* We've been given AGGR SCOPE::ID, when we're already
|
|
|
|
|
inside SCOPE. Be nice about it. */
|
|
|
|
|
if (pedantic)
|
|
|
|
|
pedwarn ("extra qualification `%T::' on member `%D' ignored",
|
|
|
|
|
scope, id);
|
|
|
|
|
}
|
2000-09-17 11:39:20 +02:00
|
|
|
|
else
|
2002-01-02 12:37:00 +01:00
|
|
|
|
error ("`%T' does not have a class or union named `%D'",
|
|
|
|
|
scope, id);
|
2000-09-13 03:02:52 +02:00
|
|
|
|
}
|
1999-04-15 19:52:25 +02:00
|
|
|
|
}
|
2002-01-02 12:37:00 +01:00
|
|
|
|
|
|
|
|
|
if (!decl)
|
|
|
|
|
{
|
2002-06-26 19:03:44 +02:00
|
|
|
|
decl = TYPE_MAIN_DECL (xref_tag (tag_kind, id, attributes, !defn_p));
|
2002-01-02 12:37:00 +01:00
|
|
|
|
xrefd_p = true;
|
|
|
|
|
}
|
1997-08-20 00:49:24 +02:00
|
|
|
|
|
2002-01-02 12:37:00 +01:00
|
|
|
|
if (!TYPE_BINFO (TREE_TYPE (decl)))
|
|
|
|
|
{
|
|
|
|
|
error ("`%T' is not a class or union type", decl);
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (defn_p)
|
|
|
|
|
{
|
|
|
|
|
/* For a definition, we want to enter the containing scope
|
|
|
|
|
before looking up any base classes etc. Only do so, if this
|
|
|
|
|
is different to the current scope. */
|
|
|
|
|
tree context = CP_DECL_CONTEXT (decl);
|
|
|
|
|
|
2002-02-07 20:49:10 +01:00
|
|
|
|
*new_type_p = (current != context
|
|
|
|
|
&& TREE_CODE (context) != TEMPLATE_TYPE_PARM
|
|
|
|
|
&& TREE_CODE (context) != BOUND_TEMPLATE_TEMPLATE_PARM);
|
2002-01-02 12:37:00 +01:00
|
|
|
|
if (*new_type_p)
|
|
|
|
|
push_scope (context);
|
2002-03-13 00:32:47 +01:00
|
|
|
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (decl)) == RECORD_TYPE)
|
|
|
|
|
/* It is legal to define a class with a different class key,
|
|
|
|
|
and this changes the default member access. */
|
|
|
|
|
CLASSTYPE_DECLARED_CLASS (TREE_TYPE (decl))
|
2002-06-26 19:03:44 +02:00
|
|
|
|
= (tag_kind == class_type);
|
2002-03-13 00:32:47 +01:00
|
|
|
|
|
2002-01-02 12:37:00 +01:00
|
|
|
|
if (!xrefd_p && PROCESSING_REAL_TEMPLATE_DECL_P ())
|
|
|
|
|
decl = push_template_decl (decl);
|
|
|
|
|
}
|
1999-04-15 19:52:25 +02:00
|
|
|
|
|
|
|
|
|
return decl;
|
1997-08-20 00:49:24 +02:00
|
|
|
|
}
|
1999-09-05 18:21:30 +02:00
|
|
|
|
|
2002-06-04 09:11:05 +02:00
|
|
|
|
#include "gt-cp-decl2.h"
|