Skip to content

R
riscv-gcc-1
Commit e349ee73 by Mike Stump
Options

86th Cygnus<->FSF quick merge 

From-SVN: r12126
parent 2670328a
Showing with 219 additions and 196 deletions
gcc/cp/ChangeLog
......@@ -3,6 +3,131 @@ Sat May 11 04:33:50 1996 Doug Evans <dje@canuck.cygnus.com>
* decl2.c (finish_vtable_vardecl): Surround DECL_ONE_ONLY with ifdef.
(finish_file): Likewise.
Wed May 29 17:04:33 1996 Mike Stump <mrs@cygnus.com>
* cvt.c (build_up_reference): Redo how and when temporaries are
created.
* decl.c (grok_reference_init): Don't try and be smart about
running cleanups.
Wed May 29 16:02:08 1996 Mike Stump <mrs@cygnus.com>
* cvt.c (build_up_reference): Add NULL_TREE to all calls to build
(TARGET_EXPR...), now that it has 4 arguments.
* tree.c (build_cplus_new): Ditto.
Thu May 23 16:40:30 1996 Jason Merrill <jason@yorick.cygnus.com>
* error.c (dump_expr, case CAST_EXPR): Handle T() properly.
* pt.c (instantiate_decl): Don't call push/pop_cp_function_context.
* decl.c (struct saved_scope): Remove named_labels,
{base,member}_init_list.
(maybe_push_to_top_level): Don't set them. Call
push_cp_function_context if appropriate.
(pop_from_top_level): Likewise.
* method.c (do_build_assign_ref): Remove obsolete check of
TYPE_HAS_ASSIGN_REF (basetype).
* decl.c (grokfndecl): Diagnose user definition of
implicitly-declared methods.
Thu May 23 12:13:08 1996 Bob Manson <manson@charmed.cygnus.com>
* method.c (do_build_copy_constructor): Add code to give
meaningful error messages instead of crashing.
(do_build_assign_ref): Don't synthesize assignment operators for
classes containing reference or const members.
* class.c (struct base_info): Remove cant_synth_copy_ctor
and cant_synth_asn_ref.
(finish_base_struct): Remove the code that tries to conditionalize
synthesis of copy constructors & assignment operators based on
access permissions. Instead, let it fail when it tries to
synthesize the copy constructor. This will give meaningful error
messages instead of silently generating code to perform a bitcopy.
Wed May 22 11:45:19 1996 Bob Manson <manson@charmed.cygnus.com>
* lex.c (real_yylex): Remove old-n-crufty #if 0 code for
determining types for constant values.
* decl.c (struct named_label_list): Use instead of stuffing
random items into a TREE_LIST node.
(named_label_uses): Use the new struct.
(poplevel): Ditto.
(lookup_label): Ditto.
(define_label): Add an error message to tell the user the line
where the goto is located in addition to the destination of the
goto.
(init_decl_processing): Use NULL instead of NULL_TREE to initialize
named_label_uses.
(finish_function): Ditto.
(start_decl): Complain about defining a static data member
in a different type from which it was declared.
Wed May 22 09:33:23 1996 Jason Merrill <jason@yorick.cygnus.com>
* cvt.c (build_expr_type_conversion): Adjust.
Tue May 21 11:21:56 1996 Jason Merrill <jason@yorick.cygnus.com>
* call.c (build_method_call): Always convert 'this' to the
appropriate type.
* search.c (add_conversions): Put the conversion function in
TREE_VALUE, the type in TREE_PURPOSE.
* cvt.c (build_type_conversion): Adjust.
* call.c (user_harshness): Adjust.
* method.c (emit_thunk): Call temporary_allocation and
permanent_allocation around the ASM_OUTPUT_MI_THUNK case, too.
* tree.c (build_cplus_array_type): Handle tweaking of
TYPE_MAIN_VARIANT here.
* typeck.c (common_type): Not here.
* typeck.c (complete_type): Only try to complete an array type if
it has a domain.
Mon May 20 14:55:59 1996 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokvardecl): Call complete_type.
(grokdeclarator): Call complete_type for PARM_DECLs.
Fri May 17 16:41:17 1996 Jason Merrill <jason@yorick.cygnus.com>
* pt.c (instantiate_class_template): Re-set
CLASSTYPE_GOT_SEMICOLON after calling finish_struct_1.
Fri May 17 14:56:55 1996 Mike Stump <mrs@cygnus.com>
* cp-tree.h (cp_expand_decl_cleanup): Remove, the backend is now
smart enough to do it right.
* tree.c (cp_expand_decl_cleanup): Ditto.
* decl.c (cp_finish_decl): Use expand_decl_cleanup instead of
cp_expand_decl_cleanup.
(store_parm_decls): Ditto.
(hack_incomplete_structures): Ditto.
* except.c (push_eh_cleanup): Ditto.
Fri May 17 13:13:51 1996 Mike Stump <mrs@cygnus.com>
* expr.c (expand_expr, cond UNSAVE_EXPR): Move from the C++
frontend to the backend where it belongs.
* tree.c (unsave_expr): Ditto.
(unsave_expr_now): Ditto.
* tree.def (UNSAVE_EXPR): Ditto.
* cp-tree.h (unsave_expr): Ditto.
(unsave_expr_now): Ditto.
Fri May 17 11:02:41 1996 Mike Stump <mrs@cygnus.com>
* init.c (emit_base_init): Make sure the partial EH cleanups live
on the function_obstack.
Thu May 16 15:29:33 1996 Bob Manson <manson@charmed.cygnus.com>
* expr.c (do_case): Don't try to dereference null TREE_TYPEs
......@@ -2369,7 +2494,7 @@ Mon Nov 13 15:45:34 1995 Mike Stump <mrs@cygnus.com>
indirect binding.
* decl.c (cp_finish_decl): Ensure that we reuse stack slots as fast
as they are unused.
(expand_static_init): Diotto.
(expand_static_init): Ditto.
(cplus_expand_expr_stmt): Ditto.
* decl2.c (finish_file): Ditto.
* init.c (perform_member_init): Ditto.
......
gcc/cp/call.c
......@@ -641,10 +641,10 @@ user_harshness (type, parmtype)
{
struct harshness_code tmp;
if (winner && TREE_PURPOSE (winner) == TREE_PURPOSE (conv))
if (winner && TREE_VALUE (winner) == TREE_VALUE (conv))
continue;
if (tmp = convert_harshness (type, TREE_VALUE (conv), NULL_TREE),
if (tmp = convert_harshness (type, TREE_PURPOSE (conv), NULL_TREE),
(tmp.code < USER_CODE) && (tmp.distance >= 0))
{
if (winner)
......@@ -2531,8 +2531,8 @@ build_method_call (instance, name, parms, basetype_path, flags)
{
int sub_flags = DECL_CONSTRUCTOR_P (function) ? flags : LOOKUP_NORMAL;
basetype = TREE_TYPE (instance);
if (TYPE_METHOD_BASETYPE (TREE_TYPE (function)) != TYPE_MAIN_VARIANT (basetype)
&& TYPE_USES_COMPLEX_INHERITANCE (basetype))
if (TYPE_METHOD_BASETYPE (TREE_TYPE (function))
!= TYPE_MAIN_VARIANT (basetype))
{
basetype = DECL_CLASS_CONTEXT (function);
instance_ptr = convert_pointer_to (basetype, instance_ptr);
......
gcc/cp/class.c
......@@ -1408,8 +1408,6 @@ struct base_info
tree rtti;
char cant_have_default_ctor;
char cant_have_const_ctor;
char cant_synth_copy_ctor;
char cant_synth_asn_ref;
char no_const_asn_ref;
char base_has_virtual;
};
......@@ -1465,13 +1463,8 @@ finish_base_struct (t, b, t_binfo)
TREE_VEC_ELT (binfos, j) = TREE_VEC_ELT (binfos, j+1);
}
if (TYPE_HAS_INIT_REF (basetype)
&& !TYPE_HAS_CONST_INIT_REF (basetype))
if (! TYPE_HAS_CONST_INIT_REF (basetype))
b->cant_have_const_ctor = 1;
if (! TYPE_HAS_INIT_REF (basetype)
|| (TYPE_HAS_NONPUBLIC_CTOR (basetype) == 2
&& ! is_friend_type (t, basetype)))
b->cant_synth_copy_ctor = 1;
if (TYPE_HAS_CONSTRUCTOR (basetype)
&& ! TYPE_HAS_DEFAULT_CONSTRUCTOR (basetype))
......@@ -1488,11 +1481,6 @@ finish_base_struct (t, b, t_binfo)
if (TYPE_HAS_ASSIGN_REF (basetype)
&& !TYPE_HAS_CONST_ASSIGN_REF (basetype))
b->no_const_asn_ref = 1;
if (! TYPE_HAS_ASSIGN_REF (basetype)
|| TYPE_HAS_ABSTRACT_ASSIGN_REF (basetype)
|| (TYPE_HAS_NONPUBLIC_ASSIGN_REF (basetype) == 2
&& ! is_friend_type (t, basetype)))
b->cant_synth_asn_ref = 1;
b->n_ancestors += CLASSTYPE_N_SUPERCLASSES (basetype);
TYPE_NEEDS_CONSTRUCTING (t) |= TYPE_NEEDS_CONSTRUCTING (basetype);
......@@ -1645,8 +1633,6 @@ finish_base_struct (t, b, t_binfo)
{
cp_warning ("direct base `%T' inaccessible in `%T' due to ambiguity",
basetype, t);
b->cant_synth_asn_ref = 1;
b->cant_synth_copy_ctor = 1;
}
}
{
......@@ -1660,8 +1646,6 @@ finish_base_struct (t, b, t_binfo)
if (extra_warnings)
cp_warning ("virtual base `%T' inaccessible in `%T' due to ambiguity",
basetype, t);
b->cant_synth_asn_ref = 1;
b->cant_synth_copy_ctor = 1;
}
}
}
......@@ -3016,8 +3000,6 @@ finish_struct_1 (t, attributes, warn_anon)
tree vfields;
int cant_have_default_ctor;
int cant_have_const_ctor;
int cant_synth_copy_ctor;
int cant_synth_asn_ref;
int no_const_asn_ref;
/* The index of the first base class which has virtual
......@@ -3108,8 +3090,6 @@ finish_struct_1 (t, attributes, warn_anon)
CLASSTYPE_RTTI (t) = base_info.rtti;
cant_have_default_ctor = base_info.cant_have_default_ctor;
cant_have_const_ctor = base_info.cant_have_const_ctor;
cant_synth_copy_ctor = base_info.cant_synth_copy_ctor;
cant_synth_asn_ref = base_info.cant_synth_asn_ref;
no_const_asn_ref = base_info.no_const_asn_ref;
base_has_virtual = base_info.base_has_virtual;
n_baseclasses = TREE_VEC_LENGTH (BINFO_BASETYPES (t_binfo));
......@@ -3126,8 +3106,6 @@ finish_struct_1 (t, attributes, warn_anon)
last_x = NULL_TREE;
cant_have_default_ctor = 0;
cant_have_const_ctor = 0;
cant_synth_copy_ctor = 0;
cant_synth_asn_ref = 0;
no_const_asn_ref = 0;
base_has_virtual = 0;
}
......@@ -3273,7 +3251,7 @@ finish_struct_1 (t, attributes, warn_anon)
#if 0
if (DECL_NAME (x) == constructor_name (t))
cant_have_default_ctor = cant_synth_copy_ctor = 1;
cant_have_default_ctor = 1;
#endif
if (TREE_TYPE (x) == error_mark_node)
......@@ -3313,8 +3291,8 @@ finish_struct_1 (t, attributes, warn_anon)
aggregate, initialization by a brace-enclosed list) is the
only way to initialize nonstatic const and reference
members. */
cant_synth_asn_ref = 1;
cant_have_default_ctor = 1;
TYPE_HAS_COMPLEX_ASSIGN_REF (t) = 1;
if (! TYPE_HAS_CONSTRUCTOR (t) && extra_warnings)
{
......@@ -3336,8 +3314,8 @@ finish_struct_1 (t, attributes, warn_anon)
aggregate, initialization by a brace-enclosed list) is the
only way to initialize nonstatic const and reference
members. */
cant_synth_asn_ref = 1;
cant_have_default_ctor = 1;
TYPE_HAS_COMPLEX_ASSIGN_REF (t) = 1;
if (! TYPE_HAS_CONSTRUCTOR (t) && !IS_SIGNATURE (t)
&& extra_warnings)
......@@ -3508,18 +3486,10 @@ finish_struct_1 (t, attributes, warn_anon)
TYPE_HAS_COMPLEX_INIT_REF (t) |= TYPE_HAS_COMPLEX_INIT_REF (type);
}
if (! TYPE_HAS_INIT_REF (type)
|| (TYPE_HAS_NONPUBLIC_CTOR (type)
&& ! is_friend (t, type)))
cant_synth_copy_ctor = 1;
else if (!TYPE_HAS_CONST_INIT_REF (type))
if (!TYPE_HAS_CONST_INIT_REF (type))
cant_have_const_ctor = 1;
if (! TYPE_HAS_ASSIGN_REF (type)
|| (TYPE_HAS_NONPUBLIC_ASSIGN_REF (type)
&& ! is_friend (t, type)))
cant_synth_asn_ref = 1;
else if (!TYPE_HAS_CONST_ASSIGN_REF (type))
if (!TYPE_HAS_CONST_ASSIGN_REF (type))
no_const_asn_ref = 1;
if (TYPE_HAS_CONSTRUCTOR (type)
......@@ -3614,8 +3584,7 @@ finish_struct_1 (t, attributes, warn_anon)
}
/* Create default copy constructor, if needed. */
if (! TYPE_HAS_INIT_REF (t) && ! cant_synth_copy_ctor
&& ! IS_SIGNATURE (t))
if (! TYPE_HAS_INIT_REF (t) && ! IS_SIGNATURE (t))
{
/* ARM 12.18: You get either X(X&) or X(const X&), but
not both. --Chip */
......@@ -3630,8 +3599,7 @@ finish_struct_1 (t, attributes, warn_anon)
TYPE_HAS_COMPLEX_ASSIGN_REF (t)
|= TYPE_HAS_ASSIGN_REF (t) || TYPE_USES_VIRTUAL_BASECLASSES (t);
if (! TYPE_HAS_ASSIGN_REF (t) && ! cant_synth_asn_ref
&& ! IS_SIGNATURE (t))
if (! TYPE_HAS_ASSIGN_REF (t) && ! IS_SIGNATURE (t))
{
tree default_fn = cons_up_default_function (t, name,
5 + no_const_asn_ref);
......
gcc/cp/cp-tree.h
......@@ -2403,7 +2403,6 @@ extern void print_lang_statistics PROTO((void));
extern tree array_type_nelts_total PROTO((tree));
extern tree array_type_nelts_top PROTO((tree));
extern tree break_out_target_exprs PROTO((tree));
extern int cp_expand_decl_cleanup PROTO((tree, tree));
extern tree get_type_decl PROTO((tree));
extern tree vec_binfo_member PROTO((tree, tree));
extern tree hack_decl_function_context PROTO((tree));
......
gcc/cp/error.c
......@@ -1285,7 +1285,8 @@ dump_expr (t, nop)
break;
case CAST_EXPR:
if (TREE_CHAIN (TREE_OPERAND (t, 0)))
if (TREE_OPERAND (t, 0) == NULL_TREE
|| TREE_CHAIN (TREE_OPERAND (t, 0)))
{
dump_type (TREE_TYPE (t), 0);
OB_PUTC ('(');
......
gcc/cp/except.c
......@@ -962,7 +962,7 @@ push_eh_cleanup ()
cleanup = build (COMPOUND_EXPR, void_type_node, cleanup,
build_modify_expr (saved_in_catch, NOP_EXPR,
build_modify_expr (saved_throw_type, NOP_EXPR, integer_zero_node)));
cp_expand_decl_cleanup (NULL_TREE, cleanup);
expand_decl_cleanup (NULL_TREE, cleanup);
resume_momentary (yes);
}
......
gcc/cp/gxxint.texi
......@@ -9,7 +9,7 @@
@chapter Internal Architecture of the Compiler
This is meant to describe the C++ front-end for gcc in detail.
Questions and comments to mrs@@cygnus.com.
Questions and comments to Mike Stump @code{<mrs@@cygnus.com>}.
@menu
* Limitations of g++::
......@@ -310,9 +310,7 @@ vtables. See also vtable and vfield.
This section describes some of the macros used on trees. The list
should be alphabetical. Eventually all macros should be documented
here. There are some postscript drawings that can be used to better
understand from of the more complex data structures, contact Mike Stump
(@code{mrs@@cygnus.com}) for information about them.
here.
@table @code
@item BINFO_BASETYPES
......
gcc/cp/init.c
......@@ -615,9 +615,14 @@ emit_base_init (t, immediately)
if (TYPE_NEEDS_DESTRUCTOR (BINFO_TYPE (base_binfo)))
{
start_protect ();
/* All cleanups must be on the function_obstack. */
push_obstacks_nochange ();
resume_temporary_allocation ();
protect_list = tree_cons (NULL_TREE,
build_partial_cleanup_for (base_binfo),
protect_list);
pop_obstacks ();
}
rbase_init_list = TREE_CHAIN (rbase_init_list);
......
gcc/cp/lex.c
......@@ -2750,24 +2750,6 @@ identifier_typedecl_value (node)
return NULL_TREE;
}
struct try_type
{
tree *node_var;
char unsigned_flag;
char long_flag;
char long_long_flag;
};
struct try_type type_sequence[] =
{
{ &integer_type_node, 0, 0, 0},
{ &unsigned_type_node, 1, 0, 0},
{ &long_integer_type_node, 0, 1, 0},
{ &long_unsigned_type_node, 1, 1, 0},
{ &long_long_integer_type_node, 0, 1, 1},
{ &long_long_unsigned_type_node, 1, 1, 1}
};
int
real_yylex ()
{
......@@ -3528,83 +3510,10 @@ real_yylex ()
yylval.ttype = build_int_2 (low, high);
TREE_TYPE (yylval.ttype) = long_long_unsigned_type_node;
#if 0
/* Find the first allowable type that the value fits in. */
type = 0;
for (i = 0; i < sizeof (type_sequence) / sizeof (type_sequence[0]);
i++)
if (!(spec_long && !type_sequence[i].long_flag)
&& !(spec_long_long && !type_sequence[i].long_long_flag)
&& !(spec_unsigned && !type_sequence[i].unsigned_flag)
/* A hex or octal constant traditionally is unsigned. */
&& !(base != 10 && flag_traditional
&& !type_sequence[i].unsigned_flag)
/* A decimal constant can't be unsigned int
unless explicitly specified. */
&& !(base == 10 && !spec_unsigned
&& *type_sequence[i].node_var == unsigned_type_node))
if (int_fits_type_p (yylval.ttype, *type_sequence[i].node_var))
{
type = *type_sequence[i].node_var;
break;
}
if (flag_traditional && type == long_unsigned_type_node
&& !spec_unsigned)
type = long_integer_type_node;
if (type == 0)
{
type = long_long_integer_type_node;
warning ("integer constant out of range");
}
/* Warn about some cases where the type of a given constant
changes from traditional C to ANSI C. */
if (warn_traditional)
{
tree other_type = 0;
/* This computation is the same as the previous one
except that flag_traditional is used backwards. */
for (i = 0; i < sizeof (type_sequence) / sizeof (type_sequence[0]);
i++)
if (!(spec_long && !type_sequence[i].long_flag)
&& !(spec_long_long && !type_sequence[i].long_long_flag)
&& !(spec_unsigned && !type_sequence[i].unsigned_flag)
/* A hex or octal constant traditionally is unsigned. */
&& !(base != 10 && !flag_traditional
&& !type_sequence[i].unsigned_flag)
/* A decimal constant can't be unsigned int
unless explicitly specified. */
&& !(base == 10 && !spec_unsigned
&& *type_sequence[i].node_var == unsigned_type_node))
if (int_fits_type_p (yylval.ttype, *type_sequence[i].node_var))
{
other_type = *type_sequence[i].node_var;
break;
}
if (!flag_traditional && type == long_unsigned_type_node
&& !spec_unsigned)
type = long_integer_type_node;
if (other_type != 0 && other_type != type)
{
if (flag_traditional)
warning ("type of integer constant would be different without -traditional");
else
warning ("type of integer constant would be different with -traditional");
}
}
#else /* 1 */
if (!spec_long && !spec_unsigned
&& !(flag_traditional && base != 10)
&& int_fits_type_p (yylval.ttype, integer_type_node))
{
#if 0
if (warn_traditional && base != 10)
warning ("small nondecimal constant becomes signed in ANSI C++");
#endif
type = integer_type_node;
}
else if (!spec_long && (base != 10 || spec_unsigned)
......@@ -3622,10 +3531,6 @@ real_yylex ()
&& int_fits_type_p (yylval.ttype,
long_unsigned_type_node))
{
#if 0
if (warn_traditional && !spec_unsigned)
warning ("large integer constant becomes unsigned in ANSI C++");
#endif
if (flag_traditional && !spec_unsigned)
type = long_integer_type_node;
else
......@@ -3642,11 +3547,6 @@ real_yylex ()
else if (int_fits_type_p (yylval.ttype,
long_long_unsigned_type_node))
{
#if 0
if (warn_traditional && !spec_unsigned)
warning ("large nondecimal constant is unsigned in ANSI C++");
#endif
if (flag_traditional && !spec_unsigned)
type = long_long_integer_type_node;
else
......@@ -3661,7 +3561,6 @@ real_yylex ()
if (base == 10 && ! spec_unsigned && TREE_UNSIGNED (type))
warning ("decimal integer constant is so large that it is unsigned");
}
#endif
TREE_TYPE (yylval.ttype) = type;
*p = 0;
......
gcc/cp/method.c
......@@ -1751,9 +1751,11 @@ emit_thunk (thunk_fndecl)
abort ();
current_function_decl = thunk_fndecl;
#ifdef ASM_OUTPUT_MI_THUNK
temporary_allocation ();
assemble_start_function (thunk_fndecl, fnname);
ASM_OUTPUT_MI_THUNK (asm_out_file, thunk_fndecl, delta, function);
assemble_end_function (thunk_fndecl, fnname);
permanent_allocation (1);
#else
save_ofp = flag_omit_frame_pointer;
flag_omit_frame_pointer = 1;
......@@ -1995,8 +1997,12 @@ do_build_copy_constructor (fndecl)
(build_reference_type (basetype), parm,
CONV_IMPLICIT|CONV_CONST, LOOKUP_COMPLAIN, NULL_TREE);
p = convert_from_reference (p);
current_base_init_list = tree_cons (basetype,
p, current_base_init_list);
if (p == error_mark_node)
cp_error ("in default copy constructor");
else
current_base_init_list = tree_cons (basetype,
p, current_base_init_list);
}
for (i = 0; i < n_bases; ++i)
......@@ -2009,9 +2015,15 @@ do_build_copy_constructor (fndecl)
p = convert_to_reference
(build_reference_type (basetype), parm,
CONV_IMPLICIT|CONV_CONST, LOOKUP_COMPLAIN, NULL_TREE);
p = convert_from_reference (p);
current_base_init_list = tree_cons (basetype,
p, current_base_init_list);
if (p == error_mark_node)
cp_error ("in default copy constructor");
else
{
p = convert_from_reference (p);
current_base_init_list = tree_cons (basetype,
p, current_base_init_list);
}
}
for (; fields; fields = TREE_CHAIN (fields))
{
......@@ -2080,16 +2092,13 @@ do_build_assign_ref (fndecl)
for (i = 0; i < n_bases; ++i)
{
tree basetype = BINFO_TYPE (TREE_VEC_ELT (binfos, i));
if (TYPE_HAS_ASSIGN_REF (basetype))
{
tree p = convert_to_reference
(build_reference_type (basetype), parm,
CONV_IMPLICIT|CONV_CONST, LOOKUP_COMPLAIN, NULL_TREE);
p = convert_from_reference (p);
p = build_member_call (basetype, ansi_opname [MODIFY_EXPR],
build_tree_list (NULL_TREE, p));
expand_expr_stmt (p);
}
tree p = convert_to_reference
(build_reference_type (basetype), parm,
CONV_IMPLICIT|CONV_CONST, LOOKUP_COMPLAIN, NULL_TREE);
p = convert_from_reference (p);
p = build_member_call (basetype, ansi_opname [MODIFY_EXPR],
build_tree_list (NULL_TREE, p));
expand_expr_stmt (p);
}
for (; fields; fields = TREE_CHAIN (fields))
{
......@@ -2098,6 +2107,24 @@ do_build_assign_ref (fndecl)
if (TREE_CODE (field) != FIELD_DECL)
continue;
if (TREE_READONLY (field))
{
if (DECL_NAME (field))
cp_error ("non-static const member `%#D', can't use default assignment operator", field);
else
cp_error ("non-static const member in type `%T', can't use default assignment operator", current_class_type);
continue;
}
else if (TREE_CODE (TREE_TYPE (field)) == REFERENCE_TYPE)
{
if (DECL_NAME (field))
cp_error ("non-static reference member `%#D', can't use default assignment operator", field);
else
cp_error ("non-static reference member in type `%T', can't use default assignment operator", current_class_type);
continue;
}
if (DECL_NAME (field))
{
if (VFIELD_NAME_P (DECL_NAME (field)))
......
gcc/cp/pt.c
......@@ -1187,6 +1187,7 @@ instantiate_class_template (type)
/* XXX handle attributes */
type = finish_struct_1 (type, NULL_TREE, 0);
CLASSTYPE_GOT_SEMICOLON (type) = 1;
}
else
{
......@@ -2968,8 +2969,6 @@ instantiate_decl (d)
if (! push_tinst_level (d))
return d;
if (TREE_CODE (d) == FUNCTION_DECL && nested)
push_cp_function_context (NULL_TREE);
push_to_top_level ();
/* Trick tsubst into giving us a new decl in case the template changed. */
......@@ -3044,8 +3043,6 @@ instantiate_decl (d)
}
pop_from_top_level ();
if (TREE_CODE (d) == FUNCTION_DECL && nested)
pop_cp_function_context (NULL_TREE);
pop_tinst_level ();
return d;
......
gcc/cp/search.c
......@@ -3508,7 +3508,7 @@ add_conversions (binfo)
tree tmp = TREE_VEC_ELT (method_vec, i);
if (! IDENTIFIER_TYPENAME_P (DECL_NAME (tmp)))
break;
conversions = tree_cons (DECL_NAME (tmp), TREE_TYPE (TREE_TYPE (tmp)),
conversions = tree_cons (TREE_TYPE (TREE_TYPE (tmp)), tmp,
conversions);
}
}
......
gcc/cp/tree.c
......@@ -220,7 +220,7 @@ build_cplus_new (type, init)
TREE_OPERAND (init, 0), TREE_OPERAND (init, 1), slot);
TREE_SIDE_EFFECTS (rval) = 1;
TREE_ADDRESSABLE (rval) = 1;
rval = build (TARGET_EXPR, type, slot, rval, NULL_TREE);
rval = build (TARGET_EXPR, type, slot, rval, NULL_TREE, NULL_TREE);
TREE_SIDE_EFFECTS (rval) = 1;
TREE_ADDRESSABLE (rval) = 1;
......@@ -399,7 +399,7 @@ build_cplus_method_type (basetype, rettype, argtypes)
}
tree
build_cplus_array_type (elt_type, index_type)
build_cplus_array_type_1 (elt_type, index_type)
tree elt_type;
tree index_type;
{
......@@ -433,6 +433,24 @@ build_cplus_array_type (elt_type, index_type)
saveable_obstack = ambient_saveable_obstack;
return t;
}
tree
build_cplus_array_type (elt_type, index_type)
tree elt_type;
tree index_type;
{
tree t;
int constp = TYPE_READONLY (elt_type);
int volatilep = TYPE_VOLATILE (elt_type);
elt_type = TYPE_MAIN_VARIANT (elt_type);
t = build_cplus_array_type_1 (elt_type, index_type);
if (constp || volatilep)
t = cp_build_type_variant (t, constp, volatilep);
return t;
}
/* Make a variant type in the proper way for C/C++, propagating qualifiers
down to the element type of an array. */
......@@ -451,9 +469,9 @@ cp_build_type_variant (type, constp, volatilep)
push_obstacks (TYPE_OBSTACK (real_main_variant),
TYPE_OBSTACK (real_main_variant));
type = build_cplus_array_type (cp_build_type_variant (TREE_TYPE (type),
constp, volatilep),
TYPE_DOMAIN (type));
type = build_cplus_array_type_1 (cp_build_type_variant
(TREE_TYPE (type), constp, volatilep),
TYPE_DOMAIN (type));
/* TYPE must be on same obstack as REAL_MAIN_VARIANT. If not,
make a copy. (TYPE might have come from the hash table and
......@@ -467,6 +485,7 @@ cp_build_type_variant (type, constp, volatilep)
TYPE_MAIN_VARIANT (type) = real_main_variant;
pop_obstacks ();
return type;
}
return build_type_variant (type, constp, volatilep);
}
......@@ -1753,16 +1772,6 @@ break_out_target_exprs (t)
return mapcar (t, bot_manip);
}
/* Since cleanup may have SAVE_EXPRs in it, we protect it with an
UNSAVE_EXPR as the backend cannot yet handle SAVE_EXPRs in cleanups
by itself. */
int
cp_expand_decl_cleanup (decl, cleanup)
tree decl, cleanup;
{
return expand_decl_cleanup (decl, unsave_expr (cleanup));
}
/* Obstack used for allocating nodes in template function and variable
definitions. */
......
gcc/cp/typeck.c
......@@ -129,7 +129,7 @@ complete_type (type)
{
if (TYPE_SIZE (type) != NULL_TREE)
;
else if (TREE_CODE (type) == ARRAY_TYPE)
else if (TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type))
{
tree t = complete_type (TREE_TYPE (type));
if (TYPE_SIZE (t) != NULL_TREE)
......@@ -437,10 +437,6 @@ common_type (t1, t2)
case ARRAY_TYPE:
{
int constp
= TYPE_READONLY (t1) || TYPE_READONLY (t2);
int volatilep
= TYPE_VOLATILE (t1) || TYPE_VOLATILE (t2);
tree elt = common_type (TREE_TYPE (t1), TREE_TYPE (t2));
/* Save space: see if the result is identical to one of the args. */
if (elt == TREE_TYPE (t1) && TYPE_DOMAIN (t1))
......@@ -448,9 +444,8 @@ common_type (t1, t2)
if (elt == TREE_TYPE (t2) && TYPE_DOMAIN (t2))
return build_type_attribute_variant (t2, attributes);
/* Merge the element types, and have a size if either arg has one. */
t1 = build_cplus_array_type (TYPE_MAIN_VARIANT (elt), TYPE_DOMAIN (TYPE_DOMAIN (t1) ? t1 : t2));
if (constp || volatilep)
t1 = cp_build_type_variant (t1, constp, volatilep);
t1 = build_cplus_array_type
(elt, TYPE_DOMAIN (TYPE_DOMAIN (t1) ? t1 : t2));
return build_type_attribute_variant (t1, attributes);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment