1996-02-01 20:33:01 +01:00
|
|
|
|
/* RunTime Type Identification
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
Copyright (C) 1995, 96-97, 1998, 1999 Free Software Foundation, Inc.
|
1996-04-13 01:55:07 +02:00
|
|
|
|
Mostly written by Jason Merrill (jason@cygnus.com).
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#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"
|
1996-02-01 20:33:01 +01:00
|
|
|
|
#include "tree.h"
|
|
|
|
|
#include "cp-tree.h"
|
|
|
|
|
#include "flags.h"
|
|
|
|
|
#include "output.h"
|
1996-09-12 21:19:15 +02:00
|
|
|
|
#include "assert.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"
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-09-30 23:34:04 +02:00
|
|
|
|
#ifndef INT_TYPE_SIZE
|
|
|
|
|
#define INT_TYPE_SIZE BITS_PER_WORD
|
|
|
|
|
#endif
|
|
|
|
|
|
1997-08-20 00:37:19 +02:00
|
|
|
|
extern struct obstack permanent_obstack;
|
1996-02-01 20:33:01 +01: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 call_void_fn PROTO((const char *));
|
[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
|
|
|
|
static tree build_headof_sub PROTO((tree));
|
|
|
|
|
static tree build_headof PROTO((tree));
|
|
|
|
|
static tree get_tinfo_var PROTO((tree));
|
|
|
|
|
static tree ifnonnull PROTO((tree, tree));
|
|
|
|
|
static tree build_dynamic_cast_1 PROTO((tree, tree));
|
|
|
|
|
static void expand_si_desc PROTO((tree, tree));
|
|
|
|
|
static void expand_class_desc PROTO((tree, tree));
|
|
|
|
|
static void expand_attr_desc PROTO((tree, tree));
|
|
|
|
|
static void expand_ptr_desc PROTO((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
|
|
|
|
static void expand_generic_desc PROTO((tree, tree, const char *));
|
[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
|
|
|
|
static tree throw_bad_cast PROTO((void));
|
|
|
|
|
static tree throw_bad_typeid PROTO((void));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
void
|
|
|
|
|
init_rtti_processing ()
|
|
|
|
|
{
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (flag_honor_std)
|
|
|
|
|
push_namespace (get_identifier ("std"));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
type_info_type_node = xref_tag
|
1998-08-27 12:17:48 +02:00
|
|
|
|
(class_type_node, get_identifier ("type_info"), 1);
|
1998-05-08 04:06:26 +02:00
|
|
|
|
if (flag_honor_std)
|
|
|
|
|
pop_namespace ();
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tinfo_fn_id = get_identifier ("__tf");
|
|
|
|
|
tinfo_fn_type = build_function_type
|
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
|
|
|
|
(build_reference_type (build_qualified_type (type_info_type_node,
|
|
|
|
|
TYPE_QUAL_CONST)),
|
1996-04-13 01:55:07 +02:00
|
|
|
|
void_list_node);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a pointer to an object with at least one virtual table
|
|
|
|
|
pointer somewhere, return a pointer to a possible sub-object that
|
|
|
|
|
has a virtual table pointer in it that is the vtable parent for
|
|
|
|
|
that sub-object. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
static tree
|
|
|
|
|
build_headof_sub (exp)
|
|
|
|
|
tree exp;
|
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (TREE_TYPE (exp));
|
|
|
|
|
tree basetype = CLASSTYPE_RTTI (type);
|
|
|
|
|
tree binfo = get_binfo (basetype, type, 0);
|
|
|
|
|
|
|
|
|
|
exp = convert_pointer_to_real (binfo, exp);
|
|
|
|
|
return exp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given the expression EXP of type `class *', return the head of the
|
|
|
|
|
object pointed to by EXP with type cv void*, if the class has any
|
|
|
|
|
virtual functions (TYPE_VIRTUAL_P), else just return the
|
|
|
|
|
expression. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1996-02-28 23:01:56 +01:00
|
|
|
|
static tree
|
1996-02-01 20:33:01 +01:00
|
|
|
|
build_headof (exp)
|
|
|
|
|
tree exp;
|
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (exp);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree aref;
|
1997-01-21 22:32:30 +01:00
|
|
|
|
tree offset;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
if (TREE_CODE (type) != POINTER_TYPE)
|
|
|
|
|
{
|
1998-09-07 16:25:35 +02:00
|
|
|
|
error ("`headof' applied to non-pointer type");
|
1996-02-01 20:33:01 +01:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
if (!TYPE_VIRTUAL_P (type))
|
1996-02-01 20:33:01 +01:00
|
|
|
|
return exp;
|
1999-04-13 02:39:32 +02:00
|
|
|
|
if (CLASSTYPE_COM_INTERFACE (type))
|
|
|
|
|
{
|
|
|
|
|
cp_error ("RTTI not supported for COM interface type `%T'", type);
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* If we don't have rtti stuff, get to a sub-object that does. */
|
|
|
|
|
if (!CLASSTYPE_VFIELDS (TREE_TYPE (TREE_TYPE (exp))))
|
|
|
|
|
exp = build_headof_sub (exp);
|
|
|
|
|
|
|
|
|
|
/* We use this a couple of times below, protect it. */
|
|
|
|
|
exp = save_expr (exp);
|
|
|
|
|
|
|
|
|
|
aref = build_vtbl_ref (build_indirect_ref (exp, NULL_PTR), integer_zero_node);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
if (flag_vtable_thunks)
|
1996-04-13 01:55:07 +02:00
|
|
|
|
offset = aref;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-04-13 01:55:07 +02:00
|
|
|
|
offset = build_component_ref (aref, delta_identifier, NULL_TREE, 0);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
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 = build_qualified_type (ptr_type_node,
|
|
|
|
|
CP_TYPE_QUALS (TREE_TYPE (exp)));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
return build (PLUS_EXPR, type, exp,
|
1997-05-29 01:20:02 +02:00
|
|
|
|
cp_convert (ptrdiff_type_node, offset));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
1996-09-30 23:34:04 +02:00
|
|
|
|
|
|
|
|
|
/* Build a call to a generic entry point taking and returning void. */
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
call_void_fn (name)
|
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;
|
1996-09-30 23:34:04 +02:00
|
|
|
|
{
|
|
|
|
|
tree d = get_identifier (name);
|
|
|
|
|
tree type;
|
|
|
|
|
|
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (d))
|
|
|
|
|
d = IDENTIFIER_GLOBAL_VALUE (d);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
|
|
|
|
|
type = build_function_type (void_type_node, void_list_node);
|
|
|
|
|
d = build_lang_decl (FUNCTION_DECL, d, type);
|
|
|
|
|
DECL_EXTERNAL (d) = 1;
|
|
|
|
|
TREE_PUBLIC (d) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (d) = 1;
|
|
|
|
|
pushdecl_top_level (d);
|
|
|
|
|
make_function_rtl (d);
|
|
|
|
|
pop_obstacks ();
|
|
|
|
|
}
|
|
|
|
|
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (d);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
return build_call (d, void_type_node, NULL_TREE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get a bad_cast node for the program to throw...
|
|
|
|
|
|
|
|
|
|
See libstdc++/exception.cc for __throw_bad_cast */
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
throw_bad_cast ()
|
|
|
|
|
{
|
|
|
|
|
return call_void_fn ("__throw_bad_cast");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
throw_bad_typeid ()
|
|
|
|
|
{
|
|
|
|
|
return call_void_fn ("__throw_bad_typeid");
|
|
|
|
|
}
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-09-30 23:34:04 +02:00
|
|
|
|
/* Return the type_info function associated with the expression EXP. If
|
|
|
|
|
EXP is a reference to a polymorphic class, return the dynamic type;
|
|
|
|
|
otherwise return the static type of the expression. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree
|
1996-09-30 23:34:04 +02:00
|
|
|
|
get_tinfo_fn_dynamic (exp)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree exp;
|
|
|
|
|
{
|
|
|
|
|
tree type;
|
|
|
|
|
|
|
|
|
|
if (exp == error_mark_node)
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
1996-11-12 20:49:48 +01:00
|
|
|
|
if (type_unknown_p (exp))
|
|
|
|
|
{
|
1998-09-07 16:25:35 +02:00
|
|
|
|
error ("typeid of overloaded function");
|
1996-11-12 20:49:48 +01:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
type = TREE_TYPE (exp);
|
|
|
|
|
|
1996-07-11 03:13:25 +02:00
|
|
|
|
/* peel back references, so they match. */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
if (TREE_CODE (type) == REFERENCE_TYPE)
|
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
|
1996-07-11 03:13:25 +02:00
|
|
|
|
/* Peel off cv qualifiers. */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
type = TYPE_MAIN_VARIANT (type);
|
|
|
|
|
|
1998-11-16 21:45:16 +01:00
|
|
|
|
if (TYPE_SIZE (complete_type (type)) == NULL_TREE)
|
|
|
|
|
{
|
|
|
|
|
cp_error ("taking typeid of incomplete type `%T'", type);
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
/* If exp is a reference to polymorphic type, get the real type_info. */
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (TYPE_VIRTUAL_P (type) && ! resolves_to_fixed_type_p (exp, 0))
|
1996-02-01 20:33:01 +01:00
|
|
|
|
{
|
|
|
|
|
/* build reference to type_info from vtable. */
|
|
|
|
|
tree t;
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
if (! flag_rtti)
|
1998-11-16 21:45:16 +01:00
|
|
|
|
error ("taking dynamic typeid of object with -fno-rtti");
|
1999-04-13 02:39:32 +02:00
|
|
|
|
if (CLASSTYPE_COM_INTERFACE (type))
|
|
|
|
|
{
|
|
|
|
|
cp_error ("RTTI not supported for COM interface type `%T'", type);
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
/* If we don't have rtti stuff, get to a sub-object that does. */
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (! CLASSTYPE_VFIELDS (type))
|
1996-04-13 01:55:07 +02:00
|
|
|
|
{
|
|
|
|
|
exp = build_unary_op (ADDR_EXPR, exp, 0);
|
|
|
|
|
exp = build_headof_sub (exp);
|
|
|
|
|
exp = build_indirect_ref (exp, NULL_PTR);
|
|
|
|
|
}
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
if (flag_vtable_thunks)
|
1996-04-13 01:55:07 +02:00
|
|
|
|
t = build_vfn_ref ((tree *) 0, exp, integer_one_node);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-04-13 01:55:07 +02:00
|
|
|
|
t = build_vfn_ref ((tree *) 0, exp, integer_zero_node);
|
|
|
|
|
TREE_TYPE (t) = build_pointer_type (tinfo_fn_type);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
return t;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* otherwise return the type_info for the static type of the expr. */
|
1996-09-30 23:34:04 +02:00
|
|
|
|
return get_tinfo_fn (TYPE_MAIN_VARIANT (type));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
build_typeid (exp)
|
|
|
|
|
tree exp;
|
|
|
|
|
{
|
|
|
|
|
exp = get_tinfo_fn_dynamic (exp);
|
|
|
|
|
exp = build_call (exp, TREE_TYPE (tinfo_fn_type), NULL_TREE);
|
|
|
|
|
return convert_from_reference (exp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
build_x_typeid (exp)
|
|
|
|
|
tree exp;
|
|
|
|
|
{
|
|
|
|
|
tree cond = NULL_TREE;
|
1999-04-27 11:41:33 +02:00
|
|
|
|
tree type;
|
1996-09-30 23:34:04 +02:00
|
|
|
|
int nonnull;
|
|
|
|
|
|
1999-04-27 11:41:33 +02:00
|
|
|
|
if (! flag_rtti)
|
|
|
|
|
{
|
|
|
|
|
error ("cannot use typeid with -fno-rtti");
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
1998-11-16 21:45:16 +01:00
|
|
|
|
if (TYPE_SIZE (type_info_type_node) == NULL_TREE)
|
|
|
|
|
{
|
|
|
|
|
error ("must #include <typeinfo> before using typeid");
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (processing_template_decl)
|
|
|
|
|
return build_min_nt (TYPEID_EXPR, exp);
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (exp) == INDIRECT_REF
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (TREE_OPERAND (exp, 0))) == POINTER_TYPE
|
|
|
|
|
&& TYPE_VIRTUAL_P (TREE_TYPE (exp))
|
|
|
|
|
&& ! resolves_to_fixed_type_p (exp, &nonnull)
|
|
|
|
|
&& ! nonnull)
|
|
|
|
|
{
|
|
|
|
|
exp = stabilize_reference (exp);
|
1997-05-29 01:20:02 +02:00
|
|
|
|
cond = cp_convert (boolean_type_node, TREE_OPERAND (exp, 0));
|
1996-09-30 23:34:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
exp = get_tinfo_fn_dynamic (exp);
|
1996-11-12 20:49:48 +01:00
|
|
|
|
|
|
|
|
|
if (exp == error_mark_node)
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
1999-04-27 11:41:33 +02:00
|
|
|
|
type = TREE_TYPE (tinfo_fn_type);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
exp = build_call (exp, type, NULL_TREE);
|
|
|
|
|
|
|
|
|
|
if (cond)
|
|
|
|
|
{
|
|
|
|
|
tree bad = throw_bad_typeid ();
|
|
|
|
|
|
|
|
|
|
bad = build_compound_expr
|
1999-09-09 08:17:13 +02:00
|
|
|
|
(tree_cons (NULL_TREE, bad, build_expr_list
|
1997-05-29 01:20:02 +02:00
|
|
|
|
(NULL_TREE, cp_convert (type, integer_zero_node))));
|
1996-09-30 23:34:04 +02:00
|
|
|
|
exp = build (COND_EXPR, type, cond, exp, bad);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return convert_from_reference (exp);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
1997-02-04 03:31:49 +01:00
|
|
|
|
static tree
|
1996-04-13 01:55:07 +02:00
|
|
|
|
get_tinfo_var (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
tree tname = build_overload_with_type (get_identifier ("__ti"), type);
|
|
|
|
|
tree tdecl, arrtype;
|
|
|
|
|
int size;
|
|
|
|
|
|
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (tname))
|
|
|
|
|
return IDENTIFIER_GLOBAL_VALUE (tname);
|
|
|
|
|
|
|
|
|
|
/* Figure out how much space we need to allocate for the type_info object.
|
|
|
|
|
If our struct layout or the type_info classes are changed, this will
|
|
|
|
|
need to be modified. */
|
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 (TYPE_QUALS (type) != TYPE_UNQUALIFIED)
|
1996-09-30 23:34:04 +02:00
|
|
|
|
size = 3 * POINTER_SIZE + INT_TYPE_SIZE;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
else if (TREE_CODE (type) == POINTER_TYPE
|
|
|
|
|
&& ! (TREE_CODE (TREE_TYPE (type)) == OFFSET_TYPE
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (type)) == METHOD_TYPE))
|
|
|
|
|
size = 3 * POINTER_SIZE;
|
|
|
|
|
else if (IS_AGGR_TYPE (type))
|
|
|
|
|
{
|
|
|
|
|
if (CLASSTYPE_N_BASECLASSES (type) == 0)
|
|
|
|
|
size = 2 * POINTER_SIZE;
|
|
|
|
|
else if (! TYPE_USES_COMPLEX_INHERITANCE (type)
|
|
|
|
|
&& (TREE_VIA_PUBLIC
|
|
|
|
|
(TREE_VEC_ELT (TYPE_BINFO_BASETYPES (type), 0))))
|
|
|
|
|
size = 3 * POINTER_SIZE;
|
|
|
|
|
else
|
1997-05-29 01:20:02 +02:00
|
|
|
|
size = 3 * POINTER_SIZE + TYPE_PRECISION (sizetype);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
size = 2 * POINTER_SIZE;
|
|
|
|
|
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
|
|
|
|
|
/* The type for a character array of the appropriate size. */
|
|
|
|
|
arrtype = build_cplus_array_type
|
|
|
|
|
(unsigned_char_type_node,
|
|
|
|
|
build_index_type (size_int (size / BITS_PER_UNIT - 1)));
|
|
|
|
|
|
|
|
|
|
tdecl = build_decl (VAR_DECL, tname, arrtype);
|
|
|
|
|
TREE_PUBLIC (tdecl) = 1;
|
|
|
|
|
DECL_EXTERNAL (tdecl) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (tdecl) = 1;
|
1999-09-10 10:14:16 +02:00
|
|
|
|
push_to_top_level ();
|
|
|
|
|
pushdecl (tdecl);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
cp_finish_decl (tdecl, NULL_TREE, NULL_TREE, 0, 0);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
pop_from_top_level ();
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
pop_obstacks ();
|
|
|
|
|
|
|
|
|
|
return tdecl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
get_tinfo_fn (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
1996-11-12 20:49:48 +01:00
|
|
|
|
tree name;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree d;
|
|
|
|
|
|
1996-11-12 20:49:48 +01:00
|
|
|
|
if (TREE_CODE (type) == OFFSET_TYPE)
|
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
if (TREE_CODE (type) == METHOD_TYPE)
|
|
|
|
|
type = build_function_type (TREE_TYPE (type),
|
|
|
|
|
TREE_CHAIN (TYPE_ARG_TYPES (type)));
|
|
|
|
|
|
|
|
|
|
name = build_overload_with_type (tinfo_fn_id, type);
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (name))
|
|
|
|
|
return IDENTIFIER_GLOBAL_VALUE (name);
|
|
|
|
|
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
|
|
|
|
|
d = build_lang_decl (FUNCTION_DECL, name, tinfo_fn_type);
|
|
|
|
|
DECL_EXTERNAL (d) = 1;
|
|
|
|
|
TREE_PUBLIC (d) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (d) = 1;
|
|
|
|
|
DECL_NOT_REALLY_EXTERN (d) = 1;
|
1999-04-23 01:13:12 +02:00
|
|
|
|
SET_DECL_TINFO_FN_P (d);
|
1999-09-08 22:12:35 +02:00
|
|
|
|
TREE_TYPE (name) = type;
|
1998-07-23 04:29:34 +02:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
pushdecl_top_level (d);
|
|
|
|
|
make_function_rtl (d);
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (d);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
mark_inline_for_output (d);
|
|
|
|
|
pop_obstacks ();
|
|
|
|
|
|
|
|
|
|
return d;
|
|
|
|
|
}
|
|
|
|
|
|
1998-11-16 21:45:16 +01:00
|
|
|
|
tree
|
1996-04-13 01:55:07 +02:00
|
|
|
|
get_typeid_1 (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
1998-11-16 21:45:16 +01:00
|
|
|
|
tree t;
|
|
|
|
|
|
|
|
|
|
t = build_call
|
1996-09-30 23:34:04 +02:00
|
|
|
|
(get_tinfo_fn (type), TREE_TYPE (tinfo_fn_type), NULL_TREE);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
return convert_from_reference (t);
|
|
|
|
|
}
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
/* Return the type_info object for TYPE, creating it if necessary. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree
|
|
|
|
|
get_typeid (type)
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
if (type == error_mark_node)
|
|
|
|
|
return error_mark_node;
|
1998-11-16 21:45:16 +01:00
|
|
|
|
|
|
|
|
|
if (TYPE_SIZE (type_info_type_node) == NULL_TREE)
|
1998-03-04 13:13:02 +01:00
|
|
|
|
{
|
1998-11-16 21:45:16 +01:00
|
|
|
|
error ("must #include <typeinfo> before using typeid");
|
|
|
|
|
return error_mark_node;
|
1998-03-04 13:13:02 +01:00
|
|
|
|
}
|
1998-11-16 21:45:16 +01:00
|
|
|
|
|
1997-02-12 21:23:55 +01:00
|
|
|
|
if (processing_template_decl)
|
|
|
|
|
return build_min_nt (TYPEID_EXPR, type);
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* If the type of the type-id is a reference type, the result of the
|
|
|
|
|
typeid expression refers to a type_info object representing the
|
|
|
|
|
referenced type. */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
if (TREE_CODE (type) == REFERENCE_TYPE)
|
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* The top-level cv-qualifiers of the lvalue expression or the type-id
|
1996-07-11 03:13:25 +02:00
|
|
|
|
that is the operand of typeid are always ignored. */
|
1996-04-13 01:55:07 +02:00
|
|
|
|
type = TYPE_MAIN_VARIANT (type);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1998-11-16 21:45:16 +01:00
|
|
|
|
if (TYPE_SIZE (complete_type (type)) == NULL_TREE)
|
|
|
|
|
{
|
|
|
|
|
cp_error ("taking typeid of incomplete type `%T'", type);
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
return get_typeid_1 (type);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-04-19 02:48:03 +02:00
|
|
|
|
/* Check whether TEST is null before returning RESULT. If TEST is used in
|
|
|
|
|
RESULT, it must have previously had a save_expr applied to it. */
|
|
|
|
|
|
1997-02-04 03:31:49 +01:00
|
|
|
|
static tree
|
1996-07-11 03:13:25 +02:00
|
|
|
|
ifnonnull (test, result)
|
1996-04-19 02:48:03 +02:00
|
|
|
|
tree test, result;
|
|
|
|
|
{
|
|
|
|
|
return build (COND_EXPR, TREE_TYPE (result),
|
|
|
|
|
build (EQ_EXPR, boolean_type_node, test, integer_zero_node),
|
1997-05-29 01:20:02 +02:00
|
|
|
|
cp_convert (TREE_TYPE (result), integer_zero_node),
|
1996-04-19 02:48:03 +02:00
|
|
|
|
result);
|
|
|
|
|
}
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
/* Execute a dynamic cast, as described in section 5.2.6 of the 9/93 working
|
|
|
|
|
paper. */
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
1997-07-24 23:09:25 +02:00
|
|
|
|
static tree
|
|
|
|
|
build_dynamic_cast_1 (type, expr)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree type, expr;
|
|
|
|
|
{
|
|
|
|
|
enum tree_code tc = TREE_CODE (type);
|
1999-01-18 14:32:57 +01:00
|
|
|
|
tree exprtype;
|
1996-09-12 21:19:15 +02:00
|
|
|
|
enum tree_code ec;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree dcast_fn;
|
1998-11-16 21:45:16 +01:00
|
|
|
|
tree old_expr = expr;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1999-01-18 14:32:57 +01:00
|
|
|
|
if (TREE_CODE (expr) == OFFSET_REF)
|
|
|
|
|
expr = resolve_offset_ref (expr);
|
|
|
|
|
|
|
|
|
|
exprtype = TREE_TYPE (expr);
|
1996-09-12 21:19:15 +02:00
|
|
|
|
assert (exprtype != NULL_TREE);
|
|
|
|
|
ec = TREE_CODE (exprtype);
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
switch (tc)
|
|
|
|
|
{
|
|
|
|
|
case POINTER_TYPE:
|
|
|
|
|
if (ec == REFERENCE_TYPE)
|
|
|
|
|
{
|
|
|
|
|
expr = convert_from_reference (expr);
|
|
|
|
|
exprtype = TREE_TYPE (expr);
|
|
|
|
|
ec = TREE_CODE (exprtype);
|
|
|
|
|
}
|
|
|
|
|
if (ec != POINTER_TYPE)
|
|
|
|
|
goto fail;
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (exprtype)) != RECORD_TYPE)
|
|
|
|
|
goto fail;
|
1997-07-08 02:17:49 +02:00
|
|
|
|
if (TYPE_SIZE (complete_type (TREE_TYPE (exprtype))) == NULL_TREE)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
goto fail;
|
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 (!at_least_as_qualified_p (TREE_TYPE (type),
|
|
|
|
|
TREE_TYPE (exprtype)))
|
1996-02-01 20:33:01 +01:00
|
|
|
|
goto fail;
|
|
|
|
|
if (TYPE_MAIN_VARIANT (TREE_TYPE (type)) == void_type_node)
|
|
|
|
|
break;
|
|
|
|
|
/* else fall through */
|
|
|
|
|
case REFERENCE_TYPE:
|
1996-04-05 20:07:00 +02:00
|
|
|
|
if (TREE_CODE (TREE_TYPE (type)) != RECORD_TYPE)
|
|
|
|
|
goto fail;
|
1997-07-08 02:17:49 +02:00
|
|
|
|
if (TYPE_SIZE (complete_type (TREE_TYPE (type))) == NULL_TREE)
|
1996-04-05 20:07:00 +02:00
|
|
|
|
goto fail;
|
|
|
|
|
break;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
/* else fall through */
|
|
|
|
|
default:
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Apply trivial conversion T -> T& for dereferenced ptrs. */
|
|
|
|
|
if (ec == RECORD_TYPE)
|
|
|
|
|
{
|
|
|
|
|
exprtype = build_reference_type (exprtype);
|
|
|
|
|
expr = convert_to_reference (exprtype, expr, CONV_IMPLICIT,
|
|
|
|
|
LOOKUP_NORMAL, NULL_TREE);
|
|
|
|
|
ec = REFERENCE_TYPE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (tc == REFERENCE_TYPE)
|
|
|
|
|
{
|
|
|
|
|
if (ec != REFERENCE_TYPE)
|
|
|
|
|
goto fail;
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (exprtype)) != RECORD_TYPE)
|
|
|
|
|
goto fail;
|
1997-07-08 02:17:49 +02:00
|
|
|
|
if (TYPE_SIZE (complete_type (TREE_TYPE (exprtype))) == NULL_TREE)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
goto fail;
|
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 (!at_least_as_qualified_p (TREE_TYPE (type),
|
|
|
|
|
TREE_TYPE (exprtype)))
|
1996-02-01 20:33:01 +01:00
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If *type is an unambiguous accessible base class of *exprtype,
|
|
|
|
|
convert statically. */
|
|
|
|
|
{
|
|
|
|
|
int distance;
|
|
|
|
|
tree path;
|
|
|
|
|
|
|
|
|
|
distance = get_base_distance (TREE_TYPE (type), TREE_TYPE (exprtype), 1,
|
|
|
|
|
&path);
|
1998-11-16 21:45:16 +01:00
|
|
|
|
|
|
|
|
|
if (distance == -2)
|
|
|
|
|
{
|
|
|
|
|
cp_error ("dynamic_cast from `%T' to ambiguous base class `%T'",
|
|
|
|
|
TREE_TYPE (exprtype), TREE_TYPE (type));
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
if (distance == -3)
|
|
|
|
|
{
|
|
|
|
|
cp_error ("dynamic_cast from `%T' to private base class `%T'",
|
|
|
|
|
TREE_TYPE (exprtype), TREE_TYPE (type));
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
if (distance >= 0)
|
|
|
|
|
return build_vbase_path (PLUS_EXPR, type, expr, path, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Otherwise *exprtype must be a polymorphic class (have a vtbl). */
|
|
|
|
|
if (TYPE_VIRTUAL_P (TREE_TYPE (exprtype)))
|
|
|
|
|
{
|
1996-04-19 02:48:03 +02:00
|
|
|
|
tree expr1;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
/* if TYPE is `void *', return pointer to complete object. */
|
|
|
|
|
if (tc == POINTER_TYPE
|
|
|
|
|
&& TYPE_MAIN_VARIANT (TREE_TYPE (type)) == void_type_node)
|
|
|
|
|
{
|
|
|
|
|
/* if b is an object, dynamic_cast<void *>(&b) == (void *)&b. */
|
|
|
|
|
if (TREE_CODE (expr) == ADDR_EXPR
|
|
|
|
|
&& TREE_CODE (TREE_OPERAND (expr, 0)) == VAR_DECL
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == RECORD_TYPE)
|
|
|
|
|
return build1 (NOP_EXPR, type, expr);
|
|
|
|
|
|
1996-04-19 02:48:03 +02:00
|
|
|
|
/* Since expr is used twice below, save it. */
|
|
|
|
|
expr = save_expr (expr);
|
|
|
|
|
|
|
|
|
|
expr1 = build_headof (expr);
|
|
|
|
|
if (TREE_TYPE (expr1) != type)
|
|
|
|
|
expr1 = build1 (NOP_EXPR, type, expr1);
|
|
|
|
|
return ifnonnull (expr, expr1);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tree retval;
|
1996-04-19 02:48:03 +02:00
|
|
|
|
tree result, td1, td2, td3, elems, expr2;
|
1999-09-21 16:40:13 +02:00
|
|
|
|
tree static_type, target_type, boff;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
/* If we got here, we can't convert statically. Therefore,
|
|
|
|
|
dynamic_cast<D&>(b) (b an object) cannot succeed. */
|
|
|
|
|
if (ec == REFERENCE_TYPE)
|
|
|
|
|
{
|
1998-11-16 21:45:16 +01:00
|
|
|
|
if (TREE_CODE (old_expr) == VAR_DECL
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (old_expr)) == RECORD_TYPE)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
{
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_warning ("dynamic_cast of `%#D' to `%#T' can never succeed",
|
1998-11-16 21:45:16 +01:00
|
|
|
|
old_expr, type);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
return throw_bad_cast ();
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Ditto for dynamic_cast<D*>(&b). */
|
|
|
|
|
else if (TREE_CODE (expr) == ADDR_EXPR)
|
|
|
|
|
{
|
|
|
|
|
tree op = TREE_OPERAND (expr, 0);
|
|
|
|
|
if (TREE_CODE (op) == VAR_DECL
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (op)) == RECORD_TYPE)
|
|
|
|
|
{
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_warning ("dynamic_cast of `%#D' to `%#T' can never succeed",
|
1998-10-31 03:50:29 +01:00
|
|
|
|
op, type);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
retval = build_int_2 (0, 0);
|
|
|
|
|
TREE_TYPE (retval) = type;
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* Since expr is used twice below, save it. */
|
|
|
|
|
expr = save_expr (expr);
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
expr1 = expr;
|
|
|
|
|
if (tc == REFERENCE_TYPE)
|
|
|
|
|
expr1 = build_unary_op (ADDR_EXPR, expr1, 0);
|
|
|
|
|
|
|
|
|
|
/* Build run-time conversion. */
|
1996-04-13 01:55:07 +02:00
|
|
|
|
expr2 = build_headof (expr1);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
if (ec == POINTER_TYPE)
|
1996-09-30 23:34:04 +02:00
|
|
|
|
td1 = get_tinfo_fn_dynamic (build_indirect_ref (expr, NULL_PTR));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-09-30 23:34:04 +02:00
|
|
|
|
td1 = get_tinfo_fn_dynamic (expr);
|
|
|
|
|
td1 = decay_conversion (td1);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1999-09-21 16:40:13 +02:00
|
|
|
|
target_type = TYPE_MAIN_VARIANT (TREE_TYPE (type));
|
|
|
|
|
static_type = TYPE_MAIN_VARIANT (TREE_TYPE (exprtype));
|
|
|
|
|
td2 = decay_conversion (get_tinfo_fn (target_type));
|
|
|
|
|
td3 = decay_conversion (get_tinfo_fn (static_type));
|
|
|
|
|
|
|
|
|
|
/* Determine how T and V are related. */
|
|
|
|
|
boff = get_dynamic_cast_base_type (static_type, target_type);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
elems = tree_cons
|
1996-09-30 23:34:04 +02:00
|
|
|
|
(NULL_TREE, td1, tree_cons
|
|
|
|
|
(NULL_TREE, td2, tree_cons
|
1999-09-21 16:40:13 +02:00
|
|
|
|
(NULL_TREE, boff, tree_cons
|
1996-04-13 01:55:07 +02:00
|
|
|
|
(NULL_TREE, expr2, tree_cons
|
1999-09-21 16:40:13 +02:00
|
|
|
|
(NULL_TREE, td3, tree_cons
|
1996-04-13 01:55:07 +02:00
|
|
|
|
(NULL_TREE, expr1, NULL_TREE))))));
|
|
|
|
|
|
1999-09-21 16:40:13 +02:00
|
|
|
|
dcast_fn = get_identifier ("__dynamic_cast_2");
|
1996-04-13 01:55:07 +02:00
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (dcast_fn))
|
|
|
|
|
dcast_fn = IDENTIFIER_GLOBAL_VALUE (dcast_fn);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tree tmp;
|
|
|
|
|
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
tmp = tree_cons
|
1996-09-30 23:34:04 +02:00
|
|
|
|
(NULL_TREE, TREE_TYPE (td1), tree_cons
|
|
|
|
|
(NULL_TREE, TREE_TYPE (td1), tree_cons
|
1999-09-21 16:40:13 +02:00
|
|
|
|
(NULL_TREE, integer_type_node, tree_cons
|
1996-04-13 01:55:07 +02:00
|
|
|
|
(NULL_TREE, ptr_type_node, tree_cons
|
1996-09-30 23:34:04 +02:00
|
|
|
|
(NULL_TREE, TREE_TYPE (td1), tree_cons
|
1996-04-13 01:55:07 +02:00
|
|
|
|
(NULL_TREE, ptr_type_node, void_list_node))))));
|
|
|
|
|
tmp = build_function_type (ptr_type_node, tmp);
|
|
|
|
|
dcast_fn = build_lang_decl (FUNCTION_DECL, dcast_fn, tmp);
|
|
|
|
|
DECL_EXTERNAL (dcast_fn) = 1;
|
|
|
|
|
TREE_PUBLIC (dcast_fn) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (dcast_fn) = 1;
|
|
|
|
|
pushdecl_top_level (dcast_fn);
|
|
|
|
|
make_function_rtl (dcast_fn);
|
|
|
|
|
pop_obstacks ();
|
|
|
|
|
}
|
|
|
|
|
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (dcast_fn);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
result = build_call
|
|
|
|
|
(dcast_fn, TREE_TYPE (TREE_TYPE (dcast_fn)), elems);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
if (tc == REFERENCE_TYPE)
|
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
expr1 = throw_bad_cast ();
|
1996-09-30 23:34:04 +02:00
|
|
|
|
expr1 = build_compound_expr
|
1999-09-09 08:17:13 +02:00
|
|
|
|
(tree_cons (NULL_TREE, expr1,
|
cp-tree.h (scratchalloc, [...]): Define as macros for now.
* cp-tree.h (scratchalloc, build_scratch_list, make_scratch_vec,
scratch_tree_cons): Define as macros for now.
* call.c, class.c, cvt.c, decl.c, decl2.c, except.c, expr.c, init.c,
lex.c, method.c, parse.y, pt.c, rtti.c, search.c, tree.c, typeck.c,
typeck2.c: Use them and the expression_obstack variants.
From-SVN: r15900
1997-10-14 20:59:03 +02:00
|
|
|
|
build_expr_list (NULL_TREE, cp_convert (type, integer_zero_node))));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
TREE_TYPE (expr1) = type;
|
|
|
|
|
result = save_expr (result);
|
|
|
|
|
return build (COND_EXPR, type, result, result, expr1);
|
|
|
|
|
}
|
|
|
|
|
|
1996-07-11 03:13:25 +02:00
|
|
|
|
/* Now back to the type we want from a void*. */
|
1997-05-29 01:20:02 +02:00
|
|
|
|
result = cp_convert (type, result);
|
1996-04-19 02:48:03 +02:00
|
|
|
|
return ifnonnull (expr, result);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-29 01:55:28 +02:00
|
|
|
|
cp_error ("dynamic_cast from non-polymorphic type `%#T'", exprtype);
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
fail:
|
1998-09-07 16:25:35 +02:00
|
|
|
|
cp_error ("cannot dynamic_cast `%E' (of type `%#T') to type `%#T'",
|
1996-02-01 20:33:01 +01:00
|
|
|
|
expr, exprtype, type);
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
}
|
1997-07-24 23:09:25 +02:00
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
build_dynamic_cast (type, expr)
|
|
|
|
|
tree type, expr;
|
|
|
|
|
{
|
1997-11-26 11:14:51 +01:00
|
|
|
|
if (type == error_mark_node || expr == error_mark_node)
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
|
|
|
if (processing_template_decl)
|
1999-09-08 22:12:35 +02:00
|
|
|
|
return build_min (DYNAMIC_CAST_EXPR, type, expr);
|
1997-11-26 11:14:51 +01:00
|
|
|
|
|
1997-07-24 23:09:25 +02:00
|
|
|
|
return convert_from_reference (build_dynamic_cast_1 (type, expr));
|
|
|
|
|
}
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
/* Build and initialize various sorts of descriptors. Every descriptor
|
|
|
|
|
node has a name associated with it (the name created by mangling).
|
|
|
|
|
For this reason, we use the identifier as our access to the __*_desc
|
|
|
|
|
nodes, instead of sticking them directly in the types. Otherwise we
|
|
|
|
|
would burden all built-in types (and pointer types) with slots that
|
|
|
|
|
we don't necessarily want to use.
|
|
|
|
|
|
|
|
|
|
For each descriptor we build, we build a variable that contains
|
|
|
|
|
the descriptor's information. When we need this info at runtime,
|
|
|
|
|
all we need is access to these variables.
|
|
|
|
|
|
|
|
|
|
Note: these constructors always return the address of the descriptor
|
|
|
|
|
info, since that is simplest for their mutual interaction. */
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* Build an initializer for a __si_type_info node. */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
static void
|
|
|
|
|
expand_si_desc (tdecl, type)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree tdecl;
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree t, elems, fn;
|
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 = build_overload_name (type, 1, 1);
|
1997-02-12 21:23:55 +01:00
|
|
|
|
tree name_string = combine_strings (build_string (strlen (name)+1, name));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
type = BINFO_TYPE (TREE_VEC_ELT (TYPE_BINFO_BASETYPES (type), 0));
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (get_typeid_1 (type));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
t = decay_conversion (get_tinfo_var (type));
|
|
|
|
|
elems = tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (tdecl), tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (name_string), tree_cons
|
|
|
|
|
(NULL_TREE, t, NULL_TREE)));
|
|
|
|
|
|
|
|
|
|
fn = get_identifier ("__rtti_si");
|
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (fn))
|
|
|
|
|
fn = IDENTIFIER_GLOBAL_VALUE (fn);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree tmp;
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
tmp = tree_cons
|
|
|
|
|
(NULL_TREE, ptr_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, const_string_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, build_pointer_type (type_info_type_node),
|
|
|
|
|
void_list_node)));
|
|
|
|
|
tmp = build_function_type (void_type_node, tmp);
|
|
|
|
|
|
|
|
|
|
fn = build_lang_decl (FUNCTION_DECL, fn, tmp);
|
|
|
|
|
DECL_EXTERNAL (fn) = 1;
|
|
|
|
|
TREE_PUBLIC (fn) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (fn) = 1;
|
|
|
|
|
pushdecl_top_level (fn);
|
|
|
|
|
make_function_rtl (fn);
|
|
|
|
|
pop_obstacks ();
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (fn);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
fn = build_call (fn, TREE_TYPE (TREE_TYPE (fn)), elems);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (fn);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-07-11 03:13:25 +02:00
|
|
|
|
/* Build an initializer for a __class_type_info node. */
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
expand_class_desc (tdecl, type)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree tdecl;
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
|
|
|
|
tree name_string;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree fn, tmp;
|
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;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
int i = CLASSTYPE_N_BASECLASSES (type);
|
|
|
|
|
int base_cnt = 0;
|
|
|
|
|
tree binfos = TYPE_BINFO_BASETYPES (type);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
#if 0
|
|
|
|
|
/* See code below that used these. */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree vb = CLASSTYPE_VBASECLASSES (type);
|
1996-02-28 23:01:56 +01:00
|
|
|
|
int n_base = i;
|
|
|
|
|
#endif
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree base, elems, access, offset, isvir;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree elt, elts = NULL_TREE;
|
|
|
|
|
static tree base_info_type_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
if (base_info_type_node == NULL_TREE)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree fields [4];
|
|
|
|
|
|
|
|
|
|
/* A reasonably close approximation of __class_type_info::base_info */
|
|
|
|
|
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
base_info_type_node = make_lang_type (RECORD_TYPE);
|
|
|
|
|
|
|
|
|
|
/* Actually const __user_type_info * */
|
1999-08-18 22:44:14 +02:00
|
|
|
|
fields [0] = build_lang_decl
|
1996-04-13 01:55:07 +02:00
|
|
|
|
(FIELD_DECL, NULL_TREE,
|
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
|
|
|
|
build_pointer_type (build_qualified_type
|
|
|
|
|
(type_info_type_node,
|
|
|
|
|
TYPE_QUAL_CONST)));
|
1999-08-18 22:44:14 +02:00
|
|
|
|
fields [1] = build_lang_decl
|
1996-09-30 23:34:04 +02:00
|
|
|
|
(FIELD_DECL, NULL_TREE, unsigned_intSI_type_node);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
DECL_BIT_FIELD (fields[1]) = 1;
|
|
|
|
|
DECL_FIELD_SIZE (fields[1]) = 29;
|
|
|
|
|
|
1999-08-18 22:44:14 +02:00
|
|
|
|
fields [2] = build_lang_decl
|
1996-04-13 01:55:07 +02:00
|
|
|
|
(FIELD_DECL, NULL_TREE, boolean_type_node);
|
|
|
|
|
DECL_BIT_FIELD (fields[2]) = 1;
|
|
|
|
|
DECL_FIELD_SIZE (fields[2]) = 1;
|
|
|
|
|
|
|
|
|
|
/* Actually enum access */
|
1999-08-18 22:44:14 +02:00
|
|
|
|
fields [3] = build_lang_decl
|
1996-04-13 01:55:07 +02:00
|
|
|
|
(FIELD_DECL, NULL_TREE, integer_type_node);
|
|
|
|
|
DECL_BIT_FIELD (fields[3]) = 1;
|
|
|
|
|
DECL_FIELD_SIZE (fields[3]) = 2;
|
|
|
|
|
|
|
|
|
|
finish_builtin_type (base_info_type_node, "__base_info", fields,
|
|
|
|
|
3, ptr_type_node);
|
|
|
|
|
pop_obstacks ();
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
tree binfo = TREE_VEC_ELT (binfos, i);
|
|
|
|
|
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (get_typeid_1 (BINFO_TYPE (binfo)));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
base = decay_conversion (get_tinfo_var (BINFO_TYPE (binfo)));
|
|
|
|
|
|
1996-02-01 20:33:01 +01:00
|
|
|
|
if (TREE_VIA_VIRTUAL (binfo))
|
|
|
|
|
{
|
|
|
|
|
tree t = BINFO_TYPE (binfo);
|
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;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree field;
|
|
|
|
|
|
1998-10-01 14:31:22 +02:00
|
|
|
|
FORMAT_VBASE_NAME (name, t);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
field = lookup_field (type, get_identifier (name), 0, 0);
|
|
|
|
|
offset = size_binop (FLOOR_DIV_EXPR,
|
|
|
|
|
DECL_FIELD_BITPOS (field), size_int (BITS_PER_UNIT));
|
1998-02-01 12:45:10 +01:00
|
|
|
|
offset = convert (sizetype, offset);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
offset = BINFO_OFFSET (binfo);
|
|
|
|
|
|
|
|
|
|
if (TREE_VIA_PUBLIC (binfo))
|
1996-04-13 01:55:07 +02:00
|
|
|
|
access = access_public_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else if (TREE_VIA_PROTECTED (binfo))
|
1996-04-13 01:55:07 +02:00
|
|
|
|
access = access_protected_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-04-13 01:55:07 +02:00
|
|
|
|
access = access_private_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
if (TREE_VIA_VIRTUAL (binfo))
|
1996-04-13 01:55:07 +02:00
|
|
|
|
isvir = boolean_true_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-04-13 01:55:07 +02:00
|
|
|
|
isvir = boolean_false_node;
|
|
|
|
|
|
|
|
|
|
elt = build
|
|
|
|
|
(CONSTRUCTOR, base_info_type_node, NULL_TREE, tree_cons
|
|
|
|
|
(NULL_TREE, base, tree_cons
|
|
|
|
|
(NULL_TREE, offset, tree_cons
|
|
|
|
|
(NULL_TREE, isvir, tree_cons
|
|
|
|
|
(NULL_TREE, access, NULL_TREE)))));
|
|
|
|
|
TREE_HAS_CONSTRUCTOR (elt) = TREE_CONSTANT (elt) = TREE_STATIC (elt) = 1;
|
1999-09-09 08:17:13 +02:00
|
|
|
|
elts = tree_cons (NULL_TREE, elt, elts);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
base_cnt++;
|
|
|
|
|
}
|
|
|
|
|
#if 0
|
|
|
|
|
i = n_base;
|
|
|
|
|
while (vb)
|
|
|
|
|
{
|
|
|
|
|
tree b;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
access = access_public_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
b = TREE_VEC_ELT (binfos, i);
|
|
|
|
|
if (BINFO_TYPE (vb) == BINFO_TYPE (b) && TREE_VIA_VIRTUAL (b))
|
|
|
|
|
{
|
|
|
|
|
if (TREE_VIA_PUBLIC (b))
|
1996-04-13 01:55:07 +02:00
|
|
|
|
access = access_public_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else if (TREE_VIA_PROTECTED (b))
|
1996-04-13 01:55:07 +02:00
|
|
|
|
access = access_protected_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-04-13 01:55:07 +02:00
|
|
|
|
access = access_private_node;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
base = build_t_desc (BINFO_TYPE (vb), 1);
|
|
|
|
|
offset = BINFO_OFFSET (vb);
|
|
|
|
|
isvir = build_int_2 (1, 0);
|
|
|
|
|
|
1999-09-09 08:17:13 +02:00
|
|
|
|
base_list = tree_cons (NULL_TREE, base, base_list);
|
|
|
|
|
isvir_list = tree_cons (NULL_TREE, isvir, isvir_list);
|
|
|
|
|
acc_list = tree_cons (NULL_TREE, access, acc_list);
|
|
|
|
|
off_list = tree_cons (NULL_TREE, offset, off_list);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
base_cnt++;
|
|
|
|
|
vb = TREE_CHAIN (vb);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
name = build_overload_name (type, 1, 1);
|
1997-02-12 21:23:55 +01:00
|
|
|
|
name_string = combine_strings (build_string (strlen (name)+1, name));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
{
|
|
|
|
|
tree arrtype = build_array_type (base_info_type_node, NULL_TREE);
|
|
|
|
|
elts = build (CONSTRUCTOR, arrtype, NULL_TREE, elts);
|
1997-05-06 22:14:14 +02:00
|
|
|
|
TREE_HAS_CONSTRUCTOR (elts) = TREE_CONSTANT (elts)
|
|
|
|
|
= TREE_STATIC (elts) = 1;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
complete_array_type (arrtype, elts, 1);
|
|
|
|
|
}
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
elems = tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (tdecl), tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (name_string), tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (elts), tree_cons
|
1997-05-29 01:20:02 +02:00
|
|
|
|
(NULL_TREE, cp_convert (sizetype, build_int_2 (base_cnt, 0)),
|
|
|
|
|
NULL_TREE))));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
fn = get_identifier ("__rtti_class");
|
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (fn))
|
|
|
|
|
fn = IDENTIFIER_GLOBAL_VALUE (fn);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
tmp = tree_cons
|
|
|
|
|
(NULL_TREE, ptr_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, const_string_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, build_pointer_type (base_info_type_node), tree_cons
|
|
|
|
|
(NULL_TREE, sizetype, void_list_node))));
|
|
|
|
|
tmp = build_function_type (void_type_node, tmp);
|
|
|
|
|
|
|
|
|
|
fn = build_lang_decl (FUNCTION_DECL, fn, tmp);
|
|
|
|
|
DECL_EXTERNAL (fn) = 1;
|
|
|
|
|
TREE_PUBLIC (fn) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (fn) = 1;
|
|
|
|
|
pushdecl_top_level (fn);
|
|
|
|
|
make_function_rtl (fn);
|
|
|
|
|
pop_obstacks ();
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (fn);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
fn = build_call (fn, TREE_TYPE (TREE_TYPE (fn)), elems);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (fn);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* Build an initializer for a __pointer_type_info node. */
|
1996-07-11 03:13:25 +02:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
static void
|
|
|
|
|
expand_ptr_desc (tdecl, type)
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree tdecl;
|
|
|
|
|
tree type;
|
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree t, elems, fn;
|
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 = build_overload_name (type, 1, 1);
|
1997-02-12 21:23:55 +01:00
|
|
|
|
tree name_string = combine_strings (build_string (strlen (name)+1, name));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
type = TREE_TYPE (type);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (get_typeid_1 (type));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
t = decay_conversion (get_tinfo_var (type));
|
|
|
|
|
elems = tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (tdecl), tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (name_string), tree_cons
|
|
|
|
|
(NULL_TREE, t, NULL_TREE)));
|
|
|
|
|
|
|
|
|
|
fn = get_identifier ("__rtti_ptr");
|
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (fn))
|
|
|
|
|
fn = IDENTIFIER_GLOBAL_VALUE (fn);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tree tmp;
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
tmp = tree_cons
|
|
|
|
|
(NULL_TREE, ptr_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, const_string_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, build_pointer_type (type_info_type_node),
|
|
|
|
|
void_list_node)));
|
|
|
|
|
tmp = build_function_type (void_type_node, tmp);
|
|
|
|
|
|
|
|
|
|
fn = build_lang_decl (FUNCTION_DECL, fn, tmp);
|
|
|
|
|
DECL_EXTERNAL (fn) = 1;
|
|
|
|
|
TREE_PUBLIC (fn) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (fn) = 1;
|
|
|
|
|
pushdecl_top_level (fn);
|
|
|
|
|
make_function_rtl (fn);
|
|
|
|
|
pop_obstacks ();
|
|
|
|
|
}
|
|
|
|
|
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (fn);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
fn = build_call (fn, TREE_TYPE (TREE_TYPE (fn)), elems);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (fn);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* Build an initializer for a __attr_type_info node. */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
|
|
|
|
static void
|
1996-04-13 01:55:07 +02:00
|
|
|
|
expand_attr_desc (tdecl, type)
|
|
|
|
|
tree tdecl;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
tree type;
|
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree elems, t, fn;
|
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 = build_overload_name (type, 1, 1);
|
1997-02-12 21:23:55 +01:00
|
|
|
|
tree name_string = combine_strings (build_string (strlen (name)+1, name));
|
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 attrval = build_int_2 (TYPE_QUALS (type), 0);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (get_typeid_1 (TYPE_MAIN_VARIANT (type)));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
t = decay_conversion (get_tinfo_var (TYPE_MAIN_VARIANT (type)));
|
|
|
|
|
elems = tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (tdecl), tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (name_string), tree_cons
|
1999-09-09 08:17:13 +02:00
|
|
|
|
(NULL_TREE, attrval, tree_cons (NULL_TREE, t, NULL_TREE))));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
fn = get_identifier ("__rtti_attr");
|
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (fn))
|
|
|
|
|
fn = IDENTIFIER_GLOBAL_VALUE (fn);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tree tmp;
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
tmp = tree_cons
|
|
|
|
|
(NULL_TREE, ptr_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, const_string_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, integer_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, build_pointer_type (type_info_type_node),
|
|
|
|
|
void_list_node))));
|
|
|
|
|
tmp = build_function_type (void_type_node, tmp);
|
|
|
|
|
|
|
|
|
|
fn = build_lang_decl (FUNCTION_DECL, fn, tmp);
|
|
|
|
|
DECL_EXTERNAL (fn) = 1;
|
|
|
|
|
TREE_PUBLIC (fn) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (fn) = 1;
|
|
|
|
|
pushdecl_top_level (fn);
|
|
|
|
|
make_function_rtl (fn);
|
|
|
|
|
pop_obstacks ();
|
|
|
|
|
}
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (fn);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
fn = build_call (fn, TREE_TYPE (TREE_TYPE (fn)), elems);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (fn);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* Build an initializer for a type_info node that just has a name. */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
static void
|
|
|
|
|
expand_generic_desc (tdecl, type, fnname)
|
|
|
|
|
tree tdecl;
|
1996-02-01 20:33:01 +01:00
|
|
|
|
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 *fnname;
|
1996-02-01 20:33:01 +01: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
|
|
|
|
const char *name = build_overload_name (type, 1, 1);
|
1997-02-12 21:23:55 +01:00
|
|
|
|
tree name_string = combine_strings (build_string (strlen (name)+1, name));
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree elems = tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (tdecl), tree_cons
|
|
|
|
|
(NULL_TREE, decay_conversion (name_string), NULL_TREE));
|
|
|
|
|
|
|
|
|
|
tree fn = get_identifier (fnname);
|
|
|
|
|
if (IDENTIFIER_GLOBAL_VALUE (fn))
|
|
|
|
|
fn = IDENTIFIER_GLOBAL_VALUE (fn);
|
|
|
|
|
else
|
1996-02-01 20:33:01 +01:00
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tree tmp;
|
|
|
|
|
push_obstacks (&permanent_obstack, &permanent_obstack);
|
|
|
|
|
tmp = tree_cons
|
|
|
|
|
(NULL_TREE, ptr_type_node, tree_cons
|
|
|
|
|
(NULL_TREE, const_string_type_node, void_list_node));
|
|
|
|
|
tmp = build_function_type (void_type_node, tmp);
|
|
|
|
|
|
|
|
|
|
fn = build_lang_decl (FUNCTION_DECL, fn, tmp);
|
|
|
|
|
DECL_EXTERNAL (fn) = 1;
|
|
|
|
|
TREE_PUBLIC (fn) = 1;
|
|
|
|
|
DECL_ARTIFICIAL (fn) = 1;
|
|
|
|
|
pushdecl_top_level (fn);
|
|
|
|
|
make_function_rtl (fn);
|
|
|
|
|
pop_obstacks ();
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
class.c (resolve_address_of_overloaded_function): Mark the chosen function used.
* class.c (resolve_address_of_overloaded_function): Mark the
chosen function used.
* call.c (build_call): Make sure that a function coming in has
been marked used already.
* decl.c (expand_static_init): Call mark_used instead of
assemble_external.
* except.c (call_eh_info, do_pop_exception, expand_end_eh_spec,
alloc_eh_object, expand_throw): Likewise.
* init.c (build_builtin_delete_call): Likewise.
* rtti.c (call_void_fn, get_tinfo_fn, build_dynamic_cast_1,
expand_si_desc, expand_class_desc, expand_ptr_desc, expand_attr_desc,
expand_generic_desc): Likewise.
From-SVN: r24862
1999-01-25 21:43:21 +01:00
|
|
|
|
mark_used (fn);
|
1996-09-30 23:34:04 +02:00
|
|
|
|
fn = build_call (fn, TREE_TYPE (TREE_TYPE (fn)), elems);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_expr_stmt (fn);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
}
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
/* Generate the code for a type_info initialization function.
|
|
|
|
|
Note that we take advantage of the passage
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
5.2.7 Type identification [expr.typeid]
|
|
|
|
|
|
|
|
|
|
Whether or not the destructor is called for the type_info object at the
|
|
|
|
|
end of the program is unspecified.
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
and don't bother to arrange for these objects to be destroyed. It
|
|
|
|
|
doesn't matter, anyway, since the destructors don't do anything.
|
|
|
|
|
|
|
|
|
|
This must only be called from toplevel (i.e. from finish_file)! */
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-04-13 01:55:07 +02:00
|
|
|
|
void
|
|
|
|
|
synthesize_tinfo_fn (fndecl)
|
|
|
|
|
tree fndecl;
|
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (DECL_NAME (fndecl));
|
1998-11-15 20:24:43 +01:00
|
|
|
|
tree tmp, addr, tdecl;
|
1999-09-10 10:14:16 +02:00
|
|
|
|
tree compound_stmt;
|
|
|
|
|
tree if_stmt;
|
|
|
|
|
tree then_clause;
|
1998-11-15 20:24:43 +01:00
|
|
|
|
|
|
|
|
|
if (at_eof)
|
|
|
|
|
{
|
|
|
|
|
import_export_decl (fndecl);
|
|
|
|
|
if (DECL_REALLY_EXTERN (fndecl))
|
|
|
|
|
return;
|
|
|
|
|
}
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1999-09-10 10:14:16 +02:00
|
|
|
|
/* Declare the static typeinfo variable. */
|
1998-11-15 20:24:43 +01:00
|
|
|
|
tdecl = get_tinfo_var (type);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
DECL_EXTERNAL (tdecl) = 0;
|
|
|
|
|
TREE_STATIC (tdecl) = 1;
|
|
|
|
|
DECL_COMMON (tdecl) = 1;
|
|
|
|
|
TREE_USED (tdecl) = 1;
|
|
|
|
|
DECL_ALIGN (tdecl) = TYPE_ALIGN (ptr_type_node);
|
|
|
|
|
cp_finish_decl (tdecl, NULL_TREE, NULL_TREE, 0, 0);
|
|
|
|
|
|
1999-09-10 10:14:16 +02:00
|
|
|
|
/* Begin processing the function. */
|
1999-09-09 21:02:39 +02:00
|
|
|
|
start_function (NULL_TREE, fndecl, NULL_TREE,
|
|
|
|
|
SF_DEFAULT | SF_PRE_PARSED);
|
1999-11-12 23:25:42 +01:00
|
|
|
|
DECL_DEFER_OUTPUT (fndecl) = 1;
|
1996-04-13 01:55:07 +02:00
|
|
|
|
store_parm_decls ();
|
|
|
|
|
clear_last_expr ();
|
1999-09-10 10:14:16 +02:00
|
|
|
|
|
|
|
|
|
/* Begin the body of the function. */
|
|
|
|
|
compound_stmt = begin_compound_stmt (/*has_no_scope=*/0);
|
|
|
|
|
|
|
|
|
|
/* For convenience, we save away the address of the static
|
1999-10-28 07:10:05 +02:00
|
|
|
|
variable. */
|
1999-09-10 10:14:16 +02:00
|
|
|
|
addr = decay_conversion (tdecl);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
/* If the first word of the array (the vtable) is non-zero, we've already
|
|
|
|
|
initialized the object, so don't do it again. */
|
1999-09-10 10:14:16 +02:00
|
|
|
|
if_stmt = begin_if_stmt ();
|
1997-05-29 01:20:02 +02:00
|
|
|
|
tmp = cp_convert (build_pointer_type (ptr_type_node), addr);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tmp = build_indirect_ref (tmp, 0);
|
1999-04-20 23:48:52 +02:00
|
|
|
|
tmp = build_binary_op (EQ_EXPR, tmp, integer_zero_node);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_if_stmt_cond (tmp, if_stmt);
|
|
|
|
|
then_clause = begin_compound_stmt (/*has_no_scope=*/0);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1996-09-30 23:34:04 +02:00
|
|
|
|
if (TREE_CODE (type) == FUNCTION_TYPE)
|
|
|
|
|
expand_generic_desc (tdecl, type, "__rtti_func");
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else if (TREE_CODE (type) == ARRAY_TYPE)
|
1996-04-13 01:55:07 +02:00
|
|
|
|
expand_generic_desc (tdecl, type, "__rtti_array");
|
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
|
|
|
|
else if (TYPE_QUALS (type) != TYPE_UNQUALIFIED)
|
1996-09-30 23:34:04 +02:00
|
|
|
|
expand_attr_desc (tdecl, type);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else if (TREE_CODE (type) == POINTER_TYPE)
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (type)) == OFFSET_TYPE)
|
1996-04-13 01:55:07 +02:00
|
|
|
|
expand_generic_desc (tdecl, type, "__rtti_ptmd");
|
|
|
|
|
else if (TREE_CODE (TREE_TYPE (type)) == METHOD_TYPE)
|
|
|
|
|
expand_generic_desc (tdecl, type, "__rtti_ptmf");
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-04-13 01:55:07 +02:00
|
|
|
|
expand_ptr_desc (tdecl, type);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
1996-04-13 01:55:07 +02:00
|
|
|
|
else if (TYPE_PTRMEMFUNC_P (type))
|
|
|
|
|
expand_generic_desc (tdecl, type, "__rtti_ptmf");
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else if (IS_AGGR_TYPE (type))
|
|
|
|
|
{
|
1996-04-13 01:55:07 +02:00
|
|
|
|
if (CLASSTYPE_N_BASECLASSES (type) == 0)
|
|
|
|
|
expand_generic_desc (tdecl, type, "__rtti_user");
|
|
|
|
|
else if (! TYPE_USES_COMPLEX_INHERITANCE (type)
|
|
|
|
|
&& (TREE_VIA_PUBLIC
|
|
|
|
|
(TREE_VEC_ELT (TYPE_BINFO_BASETYPES (type), 0))))
|
|
|
|
|
expand_si_desc (tdecl, type);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
else
|
1996-04-13 01:55:07 +02:00
|
|
|
|
expand_class_desc (tdecl, type);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|
1996-04-13 01:55:07 +02:00
|
|
|
|
else if (TREE_CODE (type) == ENUMERAL_TYPE)
|
|
|
|
|
expand_generic_desc (tdecl, type, "__rtti_user");
|
|
|
|
|
else
|
|
|
|
|
my_friendly_abort (252);
|
1996-02-01 20:33:01 +01:00
|
|
|
|
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_compound_stmt (/*has_no_scope=*/0, then_clause);
|
|
|
|
|
finish_then_clause (if_stmt);
|
|
|
|
|
finish_if_stmt ();
|
1996-04-13 01:55:07 +02:00
|
|
|
|
|
|
|
|
|
/* OK, now return the type_info object. */
|
1997-05-29 01:20:02 +02:00
|
|
|
|
tmp = cp_convert (build_pointer_type (type_info_type_node), addr);
|
1996-04-13 01:55:07 +02:00
|
|
|
|
tmp = build_indirect_ref (tmp, 0);
|
1999-09-10 10:14:16 +02:00
|
|
|
|
finish_return_stmt (tmp);
|
|
|
|
|
/* Finish the function body. */
|
|
|
|
|
finish_compound_stmt (/*has_no_scope=*/0, compound_stmt);
|
1999-09-18 03:23:20 +02:00
|
|
|
|
expand_body (finish_function (lineno, 0));
|
1996-02-01 20:33:01 +01:00
|
|
|
|
}
|