Skip to content

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

58th Cygnus<->FSF merge 

From-SVN: r9186
parent a0dabda5
Showing with 240 additions and 154 deletions
gcc/cp/Makefile.in
...@@ -194,14 +194,15 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h ...@@ -194,14 +194,15 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
`echo $(PARSE_C) | sed 's,^\./,,'` `echo $(PARSE_C) | sed 's,^\./,,'`
CONFLICTS = expect 5 shift/reduce confict and 38 reduce/reduce conflicts.
$(PARSE_H) : $(PARSE_C) $(PARSE_H) : $(PARSE_C)
$(PARSE_C) : $(srcdir)/parse.y $(PARSE_C) : $(srcdir)/parse.y
@echo expect 5 shift/reduce confict and 39 reduce/reduce conflicts. @echo $(CONFLICTS)
cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o parse.c parse.y cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o parse.c parse.y
cd $(srcdir); grep '^#define[ ]*YYEMPTY' parse.c >>parse.h cd $(srcdir); grep '^#define[ ]*YYEMPTY' parse.c >>parse.h
#$(PARSE_C) $(PARSE_H) : stamp-parse ; @true #$(PARSE_C) $(PARSE_H) : stamp-parse ; @true
#stamp-parse: $(srcdir)/parse.y #stamp-parse: $(srcdir)/parse.y
# @echo expect 1 shift/reduce confict and 39 reduce/reduce conflicts. # @echo $(CONFLICTS)
# $(BISON) $(BISONFLAGS) -d $(srcdir)/parse.y # $(BISON) $(BISONFLAGS) -d $(srcdir)/parse.y
# grep '^#define[ ]*YYEMPTY' y.tab.c >>y.tab.h # grep '^#define[ ]*YYEMPTY' y.tab.c >>y.tab.h
# $(srcdir)/../move-if-change y.tab.c $(PARSE_C) # $(srcdir)/../move-if-change y.tab.c $(PARSE_C)
......
gcc/cp/call.c
...@@ -593,6 +593,15 @@ can_convert (to, from) ...@@ -593,6 +593,15 @@ can_convert (to, from)
return h.code < USER_CODE; return h.code < USER_CODE;
} }
int
can_convert_arg (to, from, arg)
tree to, from, arg;
{
struct harshness_code h;
h = convert_harshness (to, from, arg);
return h.code < USER_CODE;
}
#ifdef DEBUG_MATCHING #ifdef DEBUG_MATCHING
static char * static char *
print_harshness (h) print_harshness (h)
...@@ -2371,9 +2380,12 @@ build_method_call (instance, name, parms, basetype_path, flags) ...@@ -2371,9 +2380,12 @@ build_method_call (instance, name, parms, basetype_path, flags)
assemble_external (function); assemble_external (function);
#if 0 #if 0
/* Is it a synthesized method that needs to be synthesized? */
if (DECL_ARTIFICIAL (function) && ! flag_no_inline if (DECL_ARTIFICIAL (function) && ! flag_no_inline
&& DECL_SAVED_INSNS (function) == 0 && DECL_SAVED_INSNS (function) == 0
&& ! TREE_ASM_WRITTEN (function)) && ! TREE_ASM_WRITTEN (function)
/* Kludge: don't synthesize for default args. */
&& current_function_decl)
synthesize_method (function); synthesize_method (function);
#endif #endif
......
gcc/cp/class.c
...@@ -240,7 +240,7 @@ build_vbase_path (code, type, expr, path, alias_this) ...@@ -240,7 +240,7 @@ build_vbase_path (code, type, expr, path, alias_this)
{ {
null_expr = build1 (NOP_EXPR, TYPE_POINTER_TO (last_virtual), integer_zero_node); null_expr = build1 (NOP_EXPR, TYPE_POINTER_TO (last_virtual), integer_zero_node);
expr = build (COND_EXPR, TYPE_POINTER_TO (last_virtual), expr = build (COND_EXPR, TYPE_POINTER_TO (last_virtual),
build (EQ_EXPR, integer_type_node, expr, build (EQ_EXPR, boolean_type_node, expr,
integer_zero_node), integer_zero_node),
null_expr, nonnull_expr); null_expr, nonnull_expr);
} }
...@@ -323,7 +323,7 @@ build_vbase_path (code, type, expr, path, alias_this) ...@@ -323,7 +323,7 @@ build_vbase_path (code, type, expr, path, alias_this)
expr = save_expr (expr); expr = save_expr (expr);
return build (COND_EXPR, type, return build (COND_EXPR, type,
build (EQ_EXPR, integer_type_node, expr, integer_zero_node), build (EQ_EXPR, boolean_type_node, expr, integer_zero_node),
null_expr, null_expr,
build (code, type, expr, offset)); build (code, type, expr, offset));
} }
...@@ -490,11 +490,12 @@ build_vfn_ref (ptr_to_instptr, instance, idx) ...@@ -490,11 +490,12 @@ build_vfn_ref (ptr_to_instptr, instance, idx)
return aref; return aref;
else else
{ {
*ptr_to_instptr if (ptr_to_instptr)
= build (PLUS_EXPR, TREE_TYPE (*ptr_to_instptr), *ptr_to_instptr
*ptr_to_instptr, = build (PLUS_EXPR, TREE_TYPE (*ptr_to_instptr),
convert (ptrdiff_type_node, *ptr_to_instptr,
build_component_ref (aref, delta_identifier, 0, 0))); convert (ptrdiff_type_node,
build_component_ref (aref, delta_identifier, 0, 0)));
return build_component_ref (aref, pfn_identifier, 0, 0); return build_component_ref (aref, pfn_identifier, 0, 0);
} }
} }
...@@ -2020,6 +2021,7 @@ duplicate_tag_error (t) ...@@ -2020,6 +2021,7 @@ duplicate_tag_error (t)
tree t; tree t;
{ {
cp_error ("redefinition of `%#T'", t); cp_error ("redefinition of `%#T'", t);
cp_error_at ("previous definition here", t);
/* Pretend we haven't defined this type. */ /* Pretend we haven't defined this type. */
......
gcc/cp/cp-tree.h
...@@ -1836,6 +1836,17 @@ extern tree current_class_type; /* _TYPE: the type of the current class */ ...@@ -1836,6 +1836,17 @@ extern tree current_class_type; /* _TYPE: the type of the current class */
#define CONV_C_CAST (CONV_IMPLICIT | CONV_STATIC | CONV_CONST \ #define CONV_C_CAST (CONV_IMPLICIT | CONV_STATIC | CONV_CONST \
| CONV_REINTERPRET | CONV_PRIVATE | CONV_FORCE_TEMP) | CONV_REINTERPRET | CONV_PRIVATE | CONV_FORCE_TEMP)
/* Used by build_expr_type_conversion to indicate which types are
acceptable as arguments to the expression under consideration. */
#define WANT_INT 1 /* integer types, including bool */
#define WANT_FLOAT 2 /* floating point types */
#define WANT_ENUM 4 /* enumerated types */
#define WANT_POINTER 8 /* pointer types */
#define WANT_NULL 16 /* null pointer constant */
#define WANT_ARITH (WANT_INT | WANT_FLOAT)
/* Anatomy of a DECL_FRIENDLIST (which is a TREE_LIST): /* Anatomy of a DECL_FRIENDLIST (which is a TREE_LIST):
purpose = friend name (IDENTIFIER_NODE); purpose = friend name (IDENTIFIER_NODE);
value = TREE_LIST of FUNCTION_DECLS; value = TREE_LIST of FUNCTION_DECLS;
...@@ -1913,8 +1924,8 @@ extern tree convert PROTO((tree, tree)); ...@@ -1913,8 +1924,8 @@ extern tree convert PROTO((tree, tree));
extern tree cp_convert PROTO((tree, tree, int, int)); extern tree cp_convert PROTO((tree, tree, int, int));
extern tree convert_force PROTO((tree, tree, int)); extern tree convert_force PROTO((tree, tree, int));
extern tree build_type_conversion PROTO((enum tree_code, tree, tree, int)); extern tree build_type_conversion PROTO((enum tree_code, tree, tree, int));
extern tree build_expr_type_conversion PROTO((int, tree, int));
extern int build_default_binary_type_conversion PROTO((enum tree_code, tree *, tree *)); extern int build_default_binary_type_conversion PROTO((enum tree_code, tree *, tree *));
extern int build_default_unary_type_conversion PROTO((enum tree_code, tree *));
extern tree type_promotes_to PROTO((tree)); extern tree type_promotes_to PROTO((tree));
/* decl.c */ /* decl.c */
...@@ -2042,9 +2053,10 @@ extern tree get_namespace_id PROTO((void)); ...@@ -2042,9 +2053,10 @@ extern tree get_namespace_id PROTO((void));
/* in edsel.c */ /* in edsel.c */
/* in except.c */ /* in except.c */
extern tree protect_list;
extern void start_protect PROTO((void)); extern void start_protect PROTO((void));
extern void end_protect PROTO((tree)); extern void end_protect PROTO((tree));
extern void end_protect_partials ();
extern void expand_exception_blocks PROTO((void)); extern void expand_exception_blocks PROTO((void));
extern void expand_start_try_stmts PROTO((void)); extern void expand_start_try_stmts PROTO((void));
extern void expand_end_try_stmts PROTO((void)); extern void expand_end_try_stmts PROTO((void));
...@@ -2053,7 +2065,8 @@ extern void expand_end_all_catch PROTO((void)); ...@@ -2053,7 +2065,8 @@ extern void expand_end_all_catch PROTO((void));
extern void start_catch_block PROTO((tree, tree)); extern void start_catch_block PROTO((tree, tree));
extern void end_catch_block PROTO((void)); extern void end_catch_block PROTO((void));
extern void expand_throw PROTO((tree)); extern void expand_throw PROTO((tree));
extern int build_exception_table PROTO((void)); extern int might_have_exceptions_p PROTO((void));
extern void emit_exception_table PROTO((void));
extern tree build_throw PROTO((tree)); extern tree build_throw PROTO((tree));
extern void init_exception_processing PROTO((void)); extern void init_exception_processing PROTO((void));
...@@ -2093,7 +2106,7 @@ extern tree get_type_value PROTO((tree)); ...@@ -2093,7 +2106,7 @@ extern tree get_type_value PROTO((tree));
extern tree build_member_call PROTO((tree, tree, tree)); extern tree build_member_call PROTO((tree, tree, tree));
extern tree build_offset_ref PROTO((tree, tree)); extern tree build_offset_ref PROTO((tree, tree));
extern tree get_member_function PROTO((tree *, tree, tree)); extern tree get_member_function PROTO((tree *, tree, tree));
extern tree get_member_function_from_ptrfunc PROTO((tree *, tree, tree)); extern tree get_member_function_from_ptrfunc PROTO((tree *, tree));
extern tree resolve_offset_ref PROTO((tree)); extern tree resolve_offset_ref PROTO((tree));
extern tree decl_constant_value PROTO((tree)); extern tree decl_constant_value PROTO((tree));
extern int is_friend_type PROTO((tree, tree)); extern int is_friend_type PROTO((tree, tree));
......
gcc/cp/decl2.c
...@@ -1027,6 +1027,7 @@ grok_array_decl (array_expr, index_exp) ...@@ -1027,6 +1027,7 @@ grok_array_decl (array_expr, index_exp)
tree array_expr, index_exp; tree array_expr, index_exp;
{ {
tree type = TREE_TYPE (array_expr); tree type = TREE_TYPE (array_expr);
tree p1, p2, i1, i2;
if (type == error_mark_node || index_exp == error_mark_node) if (type == error_mark_node || index_exp == error_mark_node)
return error_mark_node; return error_mark_node;
...@@ -1049,28 +1050,38 @@ grok_array_decl (array_expr, index_exp) ...@@ -1049,28 +1050,38 @@ grok_array_decl (array_expr, index_exp)
array_expr, index_exp, NULL_TREE); array_expr, index_exp, NULL_TREE);
/* Otherwise, create an ARRAY_REF for a pointer or array type. */ /* Otherwise, create an ARRAY_REF for a pointer or array type. */
if (TREE_CODE (type) == POINTER_TYPE
|| TREE_CODE (type) == ARRAY_TYPE)
return build_array_ref (array_expr, index_exp);
/* Woops, looks like they did something like `5[a]' instead of `a[5]'. if (TREE_CODE (type) == ARRAY_TYPE)
We don't emit a warning or error for this, since it's allowed p1 = array_expr;
by ARM $8.2.4. */ else
p1 = build_expr_type_conversion (WANT_POINTER, array_expr, 0);
type = TREE_TYPE (index_exp); if (TREE_CODE (TREE_TYPE (index_exp)) == ARRAY_TYPE)
p2 = index_exp;
else
p2 = build_expr_type_conversion (WANT_POINTER, index_exp, 0);
if (TREE_CODE (type) == OFFSET_TYPE i1 = build_expr_type_conversion (WANT_INT | WANT_ENUM, array_expr, 0);
|| TREE_CODE (type) == REFERENCE_TYPE) i2 = build_expr_type_conversion (WANT_INT | WANT_ENUM, index_exp, 0);
type = TREE_TYPE (type);
if (TREE_CODE (type) == POINTER_TYPE if ((p1 && i2) && (i1 && p2))
|| TREE_CODE (type) == ARRAY_TYPE) error ("ambiguous conversion for array subscript");
return build_array_ref (index_exp, array_expr);
/* The expression E1[E2] is identical (by definition) to *((E1)+(E2)). */ if (p1 && i2)
return build_indirect_ref (build_binary_op (PLUS_EXPR, array_expr, array_expr = p1, index_exp = i2;
index_exp, 1), else if (i1 && p2)
"array indexing"); array_expr = p2, index_exp = i1;
else
{
cp_error ("invalid types `%T[%T]' for array subscript",
type, TREE_TYPE (index_exp));
return error_mark_node;
}
if (array_expr == error_mark_node || index_exp == error_mark_node)
error ("ambiguous conversion for array subscript");
return build_array_ref (array_expr, index_exp);
} }
/* Given the cast expression EXP, checking out its validity. Either return /* Given the cast expression EXP, checking out its validity. Either return
...@@ -2487,8 +2498,8 @@ import_export_vtable (decl, type, final) ...@@ -2487,8 +2498,8 @@ import_export_vtable (decl, type, final)
} }
else else
{ {
/* We can only do this optimization if we have real non-inline /* We can only wait to decide if we have real non-inline virtual
virtual functions in our class, or if we come from a template. */ functions in our class, or if we come from a template. */
int found = CLASSTYPE_TEMPLATE_INSTANTIATION (type); int found = CLASSTYPE_TEMPLATE_INSTANTIATION (type);
...@@ -2543,7 +2554,8 @@ finish_prevtable_vardecl (prev, vars) ...@@ -2543,7 +2554,8 @@ finish_prevtable_vardecl (prev, vars)
tree ctype = DECL_CONTEXT (vars); tree ctype = DECL_CONTEXT (vars);
import_export_template (ctype); import_export_template (ctype);
if (CLASSTYPE_INTERFACE_UNKNOWN (ctype) && TYPE_VIRTUAL_P (ctype)) if (CLASSTYPE_INTERFACE_UNKNOWN (ctype) && TYPE_VIRTUAL_P (ctype)
&& ! CLASSTYPE_TEMPLATE_INSTANTIATION (ctype))
{ {
tree method; tree method;
for (method = CLASSTYPE_METHODS (ctype); method != NULL_TREE; for (method = CLASSTYPE_METHODS (ctype); method != NULL_TREE;
...@@ -2562,19 +2574,11 @@ finish_prevtable_vardecl (prev, vars) ...@@ -2562,19 +2574,11 @@ finish_prevtable_vardecl (prev, vars)
import_export_vtable (vars, ctype, 1); import_export_vtable (vars, ctype, 1);
if (write_virtuals >= 0 if (flag_rtti && write_virtuals >= 0
&& ! DECL_EXTERNAL (vars) && (TREE_PUBLIC (vars) || TREE_USED (vars))) && ! DECL_EXTERNAL (vars) && (TREE_PUBLIC (vars) || TREE_USED (vars)))
{ {
extern tree the_null_vtable_entry;
/* Kick out the type descriptor before writing out the vtable. */ /* Kick out the type descriptor before writing out the vtable. */
if (flag_rtti) build_t_desc (ctype, 1);
{
build_t_desc (ctype, 1);
}
/* Write it out. */
mark_vtable_entries (vars);
} }
} }
...@@ -2582,39 +2586,13 @@ static void ...@@ -2582,39 +2586,13 @@ static void
finish_vtable_vardecl (prev, vars) finish_vtable_vardecl (prev, vars)
tree prev, vars; tree prev, vars;
{ {
tree ctype = DECL_CONTEXT (vars);
import_export_template (ctype);
if (CLASSTYPE_INTERFACE_UNKNOWN (ctype) && TYPE_VIRTUAL_P (ctype))
{
tree method;
for (method = CLASSTYPE_METHODS (ctype); method != NULL_TREE;
method = DECL_NEXT_METHOD (method))
{
if (DECL_VINDEX (method) != NULL_TREE && !DECL_SAVED_INSNS (method)
&& !DECL_ABSTRACT_VIRTUAL_P (method))
{
SET_CLASSTYPE_INTERFACE_KNOWN (ctype);
CLASSTYPE_VTABLE_NEEDS_WRITING (ctype) = ! DECL_EXTERNAL (method);
CLASSTYPE_INTERFACE_ONLY (ctype) = DECL_EXTERNAL (method);
if (flag_rtti)
cp_warning ("compiler error: rtti entry for `%T' decided too late", ctype);
break;
}
}
}
import_export_vtable (vars, ctype, 1);
if (write_virtuals >= 0 if (write_virtuals >= 0
&& ! DECL_EXTERNAL (vars) && (TREE_PUBLIC (vars) || TREE_USED (vars))) && ! DECL_EXTERNAL (vars) && (TREE_PUBLIC (vars) || TREE_USED (vars)))
{ {
extern tree the_null_vtable_entry;
/* Write it out. */ /* Write it out. */
mark_vtable_entries (vars); mark_vtable_entries (vars);
if (TREE_TYPE (DECL_INITIAL (vars)) == 0) if (TREE_TYPE (DECL_INITIAL (vars)) == 0)
store_init_value (vars, DECL_INITIAL (vars)); store_init_value (vars, DECL_INITIAL (vars));
#ifdef DWARF_DEBUGGING_INFO #ifdef DWARF_DEBUGGING_INFO
if (write_symbols == DWARF_DEBUG) if (write_symbols == DWARF_DEBUG)
...@@ -2646,8 +2624,18 @@ finish_vtable_vardecl (prev, vars) ...@@ -2646,8 +2624,18 @@ finish_vtable_vardecl (prev, vars)
rest_of_decl_compilation (vars, NULL_PTR, 1, 1); rest_of_decl_compilation (vars, NULL_PTR, 1, 1);
} }
else if (TREE_USED (vars)) else if (! TREE_USED (vars))
assemble_external (vars); /* We don't know what to do with this one yet. */
return;
/* We know that PREV must be non-zero here. */
TREE_CHAIN (prev) = TREE_CHAIN (vars);
}
static void
prune_vtable_vardecl (prev, vars)
tree prev, vars;
{
/* We know that PREV must be non-zero here. */ /* We know that PREV must be non-zero here. */
TREE_CHAIN (prev) = TREE_CHAIN (vars); TREE_CHAIN (prev) = TREE_CHAIN (vars);
} }
...@@ -2731,6 +2719,8 @@ import_export_inline (decl) ...@@ -2731,6 +2719,8 @@ import_export_inline (decl)
if (DECL_INTERFACE_KNOWN (decl)) if (DECL_INTERFACE_KNOWN (decl))
return; return;
DECL_EXTERNAL (decl) = 0;
if (DECL_TEMPLATE_INSTANTIATION (decl)) if (DECL_TEMPLATE_INSTANTIATION (decl))
{ {
if (DECL_IMPLICIT_INSTANTIATION (decl) && flag_implicit_templates) if (DECL_IMPLICIT_INSTANTIATION (decl) && flag_implicit_templates)
...@@ -2773,7 +2763,6 @@ finish_file () ...@@ -2773,7 +2763,6 @@ finish_file ()
tree fnname; tree fnname;
tree vars = static_aggregates; tree vars = static_aggregates;
int needs_cleaning = 0, needs_messing_up = 0; int needs_cleaning = 0, needs_messing_up = 0;
int have_exception_handlers = build_exception_table ();
if (flag_detailed_statistics) if (flag_detailed_statistics)
dump_tree_statistics (); dump_tree_statistics ();
...@@ -2788,7 +2777,7 @@ finish_file () ...@@ -2788,7 +2777,7 @@ finish_file ()
we'll need here. */ we'll need here. */
push_lang_context (lang_name_c); push_lang_context (lang_name_c);
if (static_ctors || vars || have_exception_handlers) if (static_ctors || vars || might_have_exceptions_p ())
needs_messing_up = 1; needs_messing_up = 1;
if (static_dtors) if (static_dtors)
needs_cleaning = 1; needs_cleaning = 1;
...@@ -2900,7 +2889,7 @@ finish_file () ...@@ -2900,7 +2889,7 @@ finish_file ()
push_momentary (); push_momentary ();
expand_start_bindings (0); expand_start_bindings (0);
if (have_exception_handlers) if (might_have_exceptions_p ())
register_exception_table (); register_exception_table ();
while (vars) while (vars)
...@@ -2931,6 +2920,7 @@ finish_file () ...@@ -2931,6 +2920,7 @@ finish_file ()
/* 9.5p5: The initializer of a static member of a class has /* 9.5p5: The initializer of a static member of a class has
the same acess rights as a member function. */ the same acess rights as a member function. */
DECL_CLASS_CONTEXT (current_function_decl) = DECL_CONTEXT (decl); DECL_CLASS_CONTEXT (current_function_decl) = DECL_CONTEXT (decl);
DECL_STATIC_FUNCTION_P (current_function_decl) = 1;
#if 0 #if 0
if (init) if (init)
...@@ -3061,30 +3051,9 @@ finish_file () ...@@ -3061,30 +3051,9 @@ finish_file ()
pushdecl (vars); pushdecl (vars);
#endif #endif
walk_vtables ((void (*)())0, finish_vtable_vardecl);
if (flag_handle_signatures) if (flag_handle_signatures)
walk_sigtables ((void (*)())0, finish_sigtable_vardecl); walk_sigtables ((void (*)())0, finish_sigtable_vardecl);
for (vars = saved_inlines; vars; vars = TREE_CHAIN (vars))
{
tree decl = TREE_VALUE (vars);
if (DECL_ARTIFICIAL (decl)
&& ! DECL_INITIAL (decl)
&& TREE_USED (decl))
synthesize_method (decl);
}
for (vars = getdecls (); vars; vars = TREE_CHAIN (vars))
{
if (TREE_CODE (vars) == THUNK_DECL)
emit_thunk (vars);
else if (TREE_CODE (vars) == FUNCTION_DECL
&& ! DECL_INTERFACE_KNOWN (vars)
&& DECL_DECLARED_STATIC (vars))
TREE_PUBLIC (vars) = 0;
}
/* Now write out inline functions which had their addresses taken and /* Now write out inline functions which had their addresses taken and
which were not declared virtual and which were not declared `extern which were not declared virtual and which were not declared `extern
inline'. */ inline'. */
...@@ -3098,10 +3067,23 @@ finish_file () ...@@ -3098,10 +3067,23 @@ finish_file ()
tree place = TREE_CHAIN (saved_inlines); tree place = TREE_CHAIN (saved_inlines);
reconsider = 0; reconsider = 0;
walk_vtables ((void (*)())0, finish_vtable_vardecl);
for (; place; place = TREE_CHAIN (place)) for (; place; place = TREE_CHAIN (place))
{ {
tree decl = TREE_VALUE (place); tree decl = TREE_VALUE (place);
if (DECL_ARTIFICIAL (decl) && ! DECL_INITIAL (decl))
{
if (TREE_USED (decl))
synthesize_method (decl);
else
{
last = place;
continue;
}
}
if (TREE_ASM_WRITTEN (decl) || DECL_SAVED_INSNS (decl) == 0) if (TREE_ASM_WRITTEN (decl) || DECL_SAVED_INSNS (decl) == 0)
{ {
TREE_CHAIN (last) = TREE_CHAIN (place); TREE_CHAIN (last) = TREE_CHAIN (place);
...@@ -3114,9 +3096,7 @@ finish_file () ...@@ -3114,9 +3096,7 @@ finish_file ()
{ {
TREE_CHAIN (last) = TREE_CHAIN (place); TREE_CHAIN (last) = TREE_CHAIN (place);
if (DECL_EXTERNAL (decl)) if (! DECL_EXTERNAL (decl))
assemble_external (decl);
else
{ {
reconsider = 1; reconsider = 1;
temporary_allocation (); temporary_allocation ();
...@@ -3132,6 +3112,21 @@ finish_file () ...@@ -3132,6 +3112,21 @@ finish_file ()
} }
} }
walk_vtables ((void (*)())0, prune_vtable_vardecl);
for (vars = getdecls (); vars; vars = TREE_CHAIN (vars))
{
if (TREE_CODE (vars) == THUNK_DECL)
emit_thunk (vars);
else if (TREE_CODE (vars) == FUNCTION_DECL
&& ! DECL_INTERFACE_KNOWN (vars)
&& DECL_DECLARED_STATIC (vars))
TREE_PUBLIC (vars) = 0;
}
if (might_have_exceptions_p ())
emit_exception_table ();
if (write_virtuals == 2) if (write_virtuals == 2)
{ {
/* Now complain about an virtual function tables promised /* Now complain about an virtual function tables promised
......
gcc/cp/error.c
...@@ -585,7 +585,7 @@ dump_decl (t, v) ...@@ -585,7 +585,7 @@ dump_decl (t, v)
break; break;
case VAR_DECL: case VAR_DECL:
if (VTABLE_NAME_P (DECL_NAME (t))) if (DECL_NAME (t) && VTABLE_NAME_P (DECL_NAME (t)))
{ {
OB_PUTS ("vtable for "); OB_PUTS ("vtable for ");
dump_type (DECL_CONTEXT (t), v); dump_type (DECL_CONTEXT (t), v);
...@@ -933,9 +933,16 @@ dump_expr (t, nop) ...@@ -933,9 +933,16 @@ dump_expr (t, nop)
char *p = enum_name_string (t, type); char *p = enum_name_string (t, type);
OB_PUTCP (p); OB_PUTCP (p);
} }
else if (type == char_type_node else if (type == boolean_type_node)
|| type == signed_char_type_node {
|| type == unsigned_char_type_node) if (t == boolean_false_node)
OB_PUTS ("false");
else if (t == boolean_true_node)
OB_PUTS ("true");
else
my_friendly_abort (366);
}
else if (type == char_type_node)
{ {
OB_PUTC ('\''); OB_PUTC ('\'');
dump_char (TREE_INT_CST_LOW (t)); dump_char (TREE_INT_CST_LOW (t));
......
gcc/cp/except.c
...@@ -31,6 +31,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -31,6 +31,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "obstack.h" #include "obstack.h"
#include "expr.h" #include "expr.h"
tree protect_list;
extern void (*interim_eh_hook) PROTO((tree)); extern void (*interim_eh_hook) PROTO((tree));
/* holds the fndecl for __builtin_return_address () */ /* holds the fndecl for __builtin_return_address () */
...@@ -53,6 +55,11 @@ tree builtin_return_address_fndecl; ...@@ -53,6 +55,11 @@ tree builtin_return_address_fndecl;
#define __mips #define __mips
#endif #endif
#endif #endif
#ifdef __i386__
#ifndef __i386
#define __i386
#endif
#endif
#if defined(__i386) || defined(__rs6000) || defined(__hppa) || defined(__mc68000) || defined (__mips) || defined (__arm) || defined (__alpha) #if defined(__i386) || defined(__rs6000) || defined(__hppa) || defined(__mc68000) || defined (__mips) || defined (__arm) || defined (__alpha)
#define TRY_NEW_EH #define TRY_NEW_EH
#endif #endif
...@@ -872,11 +879,13 @@ void ...@@ -872,11 +879,13 @@ void
end_protect (finalization) end_protect (finalization)
tree finalization; tree finalization;
{ {
struct ehEntry *entry = pop_eh_entry (&ehstack); struct ehEntry *entry;
if (! doing_eh (0)) if (! doing_eh (0))
return; return;
entry = pop_eh_entry (&ehstack);
emit_label (entry->end_label); emit_label (entry->end_label);
entry->finalization = finalization; entry->finalization = finalization;
...@@ -1574,11 +1583,29 @@ expand_throw (exp) ...@@ -1574,11 +1583,29 @@ expand_throw (exp)
/* end of: my-cp-except.c */ /* end of: my-cp-except.c */
#endif #endif
void
end_protect_partials () {
while (protect_list)
{
end_protect (TREE_VALUE (protect_list));
protect_list = TREE_CHAIN (protect_list);
}
}
int
might_have_exceptions_p ()
{
#ifdef TRY_NEW_EH
if (eh_table_output_queue.head)
return 1;
#endif
return 0;
}
/* Output the exception table. /* Output the exception table.
Return the number of handlers. */ Return the number of handlers. */
int void
build_exception_table () emit_exception_table ()
{ {
int count = 0; int count = 0;
#ifdef TRY_NEW_EH #ifdef TRY_NEW_EH
...@@ -1587,7 +1614,15 @@ build_exception_table () ...@@ -1587,7 +1614,15 @@ build_exception_table ()
tree eh_node_decl; tree eh_node_decl;
if (! doing_eh (0)) if (! doing_eh (0))
return 0; return;
exception_section ();
/* Beginning marker for table. */
ASM_OUTPUT_ALIGN (asm_out_file, 2);
ASM_OUTPUT_LABEL (asm_out_file, "__EXCEPTION_TABLE__");
output_exception_table_entry (asm_out_file,
const0_rtx, const0_rtx, const0_rtx);
while (entry = dequeue_eh_entry (&eh_table_output_queue)) while (entry = dequeue_eh_entry (&eh_table_output_queue))
{ {
...@@ -1596,32 +1631,18 @@ build_exception_table () ...@@ -1596,32 +1631,18 @@ build_exception_table ()
if (context && ! TREE_ASM_WRITTEN (context)) if (context && ! TREE_ASM_WRITTEN (context))
continue; continue;
if (count == 0)
{
exception_section ();
/* Beginning marker for table. */
ASM_OUTPUT_ALIGN (asm_out_file, 2);
ASM_OUTPUT_LABEL (asm_out_file, "__EXCEPTION_TABLE__");
output_exception_table_entry (asm_out_file,
const0_rtx, const0_rtx, const0_rtx);
}
count++; count++;
output_exception_table_entry (asm_out_file, output_exception_table_entry (asm_out_file,
entry->start_label, entry->end_label, entry->start_label, entry->end_label,
entry->exception_handler_label); entry->exception_handler_label);
} }
if (count) /* Ending marker for table. */
{ ASM_OUTPUT_LABEL (asm_out_file, "__EXCEPTION_END__");
/* Ending marker for table. */ output_exception_table_entry (asm_out_file,
ASM_OUTPUT_LABEL (asm_out_file, "__EXCEPTION_END__"); constm1_rtx, constm1_rtx, constm1_rtx);
output_exception_table_entry (asm_out_file,
constm1_rtx, constm1_rtx, constm1_rtx);
}
#endif /* TRY_NEW_EH */ #endif /* TRY_NEW_EH */
return count;
} }
void void
......
gcc/cp/lex.c
...@@ -4541,8 +4541,6 @@ real_yylex () ...@@ -4541,8 +4541,6 @@ real_yylex ()
{ value = '}'; goto done; } { value = '}'; goto done; }
else if (c == '%' && c1 == ':') else if (c == '%' && c1 == ':')
{ value = '#'; goto done; } { value = '#'; goto done; }
else if (c == ':' && c1 == '>')
{ value = ']'; goto done; }
nextchar = c1; nextchar = c1;
token_buffer[1] = 0; token_buffer[1] = 0;
...@@ -4560,6 +4558,11 @@ real_yylex () ...@@ -4560,6 +4558,11 @@ real_yylex ()
value = SCOPE; value = SCOPE;
yylval.itype = 1; yylval.itype = 1;
} }
else if (c == '>')
{
value = ']';
goto done;
}
else else
{ {
nextchar = c; nextchar = c;
......
gcc/cp/method.c
...@@ -2211,12 +2211,14 @@ synthesize_method (fndecl) ...@@ -2211,12 +2211,14 @@ synthesize_method (fndecl)
int nested = (current_function_decl != NULL_TREE); int nested = (current_function_decl != NULL_TREE);
int toplev = (decl_function_context (fndecl) == NULL_TREE); int toplev = (decl_function_context (fndecl) == NULL_TREE);
char *f = input_filename; char *f = input_filename;
tree base = DECL_CLASS_CONTEXT (fndecl);
if (nested) if (nested)
push_cp_function_context (toplev); push_cp_function_context (toplev);
input_filename = DECL_SOURCE_FILE (fndecl); input_filename = DECL_SOURCE_FILE (fndecl);
extract_interface_info (); interface_unknown = CLASSTYPE_INTERFACE_UNKNOWN (base);
interface_only = CLASSTYPE_INTERFACE_ONLY (base);
start_function (NULL_TREE, fndecl, NULL_TREE, 1); start_function (NULL_TREE, fndecl, NULL_TREE, 1);
store_parm_decls (); store_parm_decls ();
......
gcc/cp/parse.y
...@@ -1074,8 +1074,10 @@ unary_expr: ...@@ -1074,8 +1074,10 @@ unary_expr:
{ {
tree t = TREE_VALUE ($2); tree t = TREE_VALUE ($2);
if (t != NULL_TREE if (t != NULL_TREE
&& TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE) && ((TREE_TYPE (t)
pedwarn ("ANSI C++ forbids using sizeof() on a function"); && TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
|| is_overloaded_fn (t)))
pedwarn ("ANSI C++ forbids taking the sizeof a function type");
} }
$$ = c_sizeof (TREE_TYPE ($2)); } $$ = c_sizeof (TREE_TYPE ($2)); }
| SIZEOF '(' type_id ')' %prec HYPERUNARY | SIZEOF '(' type_id ')' %prec HYPERUNARY
...@@ -1142,7 +1144,7 @@ new_initializer: ...@@ -1142,7 +1144,7 @@ new_initializer:
syntactically valid but semantically invalid. */ syntactically valid but semantically invalid. */
| '=' init | '=' init
{ {
if (flag_ansi) if (pedantic)
pedwarn ("ANSI C++ forbids initialization of new expression with `='"); pedwarn ("ANSI C++ forbids initialization of new expression with `='");
$$ = $2; $$ = $2;
} }
...@@ -1169,7 +1171,7 @@ cast_expr: ...@@ -1169,7 +1171,7 @@ cast_expr:
{ {
tree init = build_nt (CONSTRUCTOR, NULL_TREE, tree init = build_nt (CONSTRUCTOR, NULL_TREE,
nreverse ($3)); nreverse ($3));
if (flag_ansi) if (pedantic)
pedwarn ("ANSI C++ forbids constructor-expressions"); pedwarn ("ANSI C++ forbids constructor-expressions");
/* Indicate that this was a GNU C constructor expression. */ /* Indicate that this was a GNU C constructor expression. */
TREE_HAS_CONSTRUCTOR (init) = 1; TREE_HAS_CONSTRUCTOR (init) = 1;
...@@ -1289,7 +1291,6 @@ unqualified_id: ...@@ -1289,7 +1291,6 @@ unqualified_id:
expr_or_declarator: expr_or_declarator:
notype_unqualified_id notype_unqualified_id
| notype_qualified_id
| '*' expr_or_declarator %prec UNARY | '*' expr_or_declarator %prec UNARY
{ $$ = build_parse_node (INDIRECT_REF, $2); } { $$ = build_parse_node (INDIRECT_REF, $2); }
| '&' expr_or_declarator %prec UNARY | '&' expr_or_declarator %prec UNARY
...@@ -1301,9 +1302,6 @@ expr_or_declarator: ...@@ -1301,9 +1302,6 @@ expr_or_declarator:
direct_notype_declarator: direct_notype_declarator:
complex_direct_notype_declarator complex_direct_notype_declarator
| notype_unqualified_id | notype_unqualified_id
| notype_qualified_id
{ push_nested_class (TREE_TYPE (OP0 ($$)), 3);
TREE_COMPLEXITY ($$) = current_class_depth; }
| '(' expr_or_declarator ')' | '(' expr_or_declarator ')'
{ $$ = finish_decl_parsing ($2); } { $$ = finish_decl_parsing ($2); }
; ;
...@@ -1360,7 +1358,7 @@ primary: ...@@ -1360,7 +1358,7 @@ primary:
$<ttype>$ = expand_start_stmt_expr (); } $<ttype>$ = expand_start_stmt_expr (); }
compstmt ')' compstmt ')'
{ tree rtl_exp; { tree rtl_exp;
if (flag_ansi) if (pedantic)
pedwarn ("ANSI C++ forbids braced-groups within expressions"); pedwarn ("ANSI C++ forbids braced-groups within expressions");
rtl_exp = expand_end_stmt_expr ($<ttype>2); rtl_exp = expand_end_stmt_expr ($<ttype>2);
/* The statements have side effects, so the group does. */ /* The statements have side effects, so the group does. */
...@@ -1554,7 +1552,7 @@ primary: ...@@ -1554,7 +1552,7 @@ primary:
| object unqualified_id %prec UNARY | object unqualified_id %prec UNARY
{ got_object = NULL_TREE; { got_object = NULL_TREE;
$$ = build_component_ref ($$, $2, NULL_TREE, 1); } $$ = build_component_ref ($$, $2, NULL_TREE, 1); }
| object qualified_id %prec UNARY | object overqualified_id %prec UNARY
{ got_object = NULL_TREE; { got_object = NULL_TREE;
$$ = build_object_ref ($$, OP0 ($2), OP1 ($2)); } $$ = build_object_ref ($$, OP0 ($2), OP1 ($2)); }
| object unqualified_id '(' nonnull_exprlist ')' | object unqualified_id '(' nonnull_exprlist ')'
...@@ -1589,7 +1587,7 @@ primary: ...@@ -1589,7 +1587,7 @@ primary:
(LOOKUP_NORMAL|LOOKUP_AGGR)); (LOOKUP_NORMAL|LOOKUP_AGGR));
#endif #endif
} }
| object qualified_id '(' nonnull_exprlist ')' | object overqualified_id '(' nonnull_exprlist ')'
{ {
got_object = NULL_TREE; got_object = NULL_TREE;
if (IS_SIGNATURE (IDENTIFIER_TYPE_VALUE (OP0 ($2)))) if (IS_SIGNATURE (IDENTIFIER_TYPE_VALUE (OP0 ($2))))
...@@ -1601,7 +1599,7 @@ primary: ...@@ -1601,7 +1599,7 @@ primary:
else else
$$ = build_scoped_method_call ($$, OP0 ($2), OP1 ($2), $4); $$ = build_scoped_method_call ($$, OP0 ($2), OP1 ($2), $4);
} }
| object qualified_id LEFT_RIGHT | object overqualified_id LEFT_RIGHT
{ {
got_object = NULL_TREE; got_object = NULL_TREE;
if (IS_SIGNATURE (IDENTIFIER_TYPE_VALUE (OP0 ($2)))) if (IS_SIGNATURE (IDENTIFIER_TYPE_VALUE (OP0 ($2))))
...@@ -1617,8 +1615,9 @@ primary: ...@@ -1617,8 +1615,9 @@ primary:
| object '~' TYPESPEC LEFT_RIGHT | object '~' TYPESPEC LEFT_RIGHT
{ {
got_object = NULL_TREE; got_object = NULL_TREE;
if (TREE_CODE (TREE_TYPE ($1)) if (IDENTIFIER_GLOBAL_VALUE ($3)
!= TREE_CODE (TREE_TYPE (IDENTIFIER_GLOBAL_VALUE ($3)))) && (TREE_CODE (TREE_TYPE ($1))
!= TREE_CODE (TREE_TYPE (IDENTIFIER_GLOBAL_VALUE ($3)))))
cp_error ("`%E' is not of type `%T'", $1, $3); cp_error ("`%E' is not of type `%T'", $1, $3);
$$ = convert (void_type_node, $1); $$ = convert (void_type_node, $1);
} }
...@@ -1654,7 +1653,7 @@ primary_no_id: ...@@ -1654,7 +1653,7 @@ primary_no_id:
} }
$<ttype>$ = expand_start_stmt_expr (); } $<ttype>$ = expand_start_stmt_expr (); }
compstmt ')' compstmt ')'
{ if (flag_ansi) { if (pedantic)
pedwarn ("ANSI C++ forbids braced-groups within expressions"); pedwarn ("ANSI C++ forbids braced-groups within expressions");
$$ = expand_end_stmt_expr ($<ttype>2); } $$ = expand_end_stmt_expr ($<ttype>2); }
| primary_no_id '(' nonnull_exprlist ')' | primary_no_id '(' nonnull_exprlist ')'
...@@ -1816,6 +1815,8 @@ typed_declspecs1: ...@@ -1816,6 +1815,8 @@ typed_declspecs1:
{ $$ = decl_tree_cons (NULL_TREE, $2, $$); } { $$ = decl_tree_cons (NULL_TREE, $2, $$); }
| typespec reserved_declspecs %prec HYPERUNARY | typespec reserved_declspecs %prec HYPERUNARY
{ $$ = decl_tree_cons (NULL_TREE, $$, $2); } { $$ = decl_tree_cons (NULL_TREE, $$, $2); }
| typespec reserved_typespecquals reserved_declspecs
{ $$ = decl_tree_cons (NULL_TREE, $$, chainon ($2, $3)); }
| declmods typespec reserved_declspecs | declmods typespec reserved_declspecs
{ $$ = decl_tree_cons (NULL_TREE, $2, chainon ($3, $$)); } { $$ = decl_tree_cons (NULL_TREE, $2, chainon ($3, $$)); }
| declmods typespec reserved_typespecquals | declmods typespec reserved_typespecquals
...@@ -1902,11 +1903,11 @@ typespec: structsp ...@@ -1902,11 +1903,11 @@ typespec: structsp
| complete_type_name | complete_type_name
| TYPEOF '(' expr ')' | TYPEOF '(' expr ')'
{ $$ = TREE_TYPE ($3); { $$ = TREE_TYPE ($3);
if (flag_ansi) if (pedantic)
pedwarn ("ANSI C++ forbids `typeof'"); } pedwarn ("ANSI C++ forbids `typeof'"); }
| TYPEOF '(' type_id ')' | TYPEOF '(' type_id ')'
{ $$ = groktypename ($3); { $$ = groktypename ($3);
if (flag_ansi) if (pedantic)
pedwarn ("ANSI C++ forbids `typeof'"); } pedwarn ("ANSI C++ forbids `typeof'"); }
| SIGOF '(' expr ')' | SIGOF '(' expr ')'
{ tree type = TREE_TYPE ($3); { tree type = TREE_TYPE ($3);
...@@ -2763,7 +2764,7 @@ new_type_id: ...@@ -2763,7 +2764,7 @@ new_type_id:
non-constant dimension. */ non-constant dimension. */
| '(' type_id ')' '[' expr ']' | '(' type_id ')' '[' expr ']'
{ {
if (flag_ansi) if (pedantic)
pedwarn ("ANSI C++ forbids array dimensions with parenthesized type in new"); pedwarn ("ANSI C++ forbids array dimensions with parenthesized type in new");
$$ = build_parse_node (ARRAY_REF, TREE_VALUE ($2), $5); $$ = build_parse_node (ARRAY_REF, TREE_VALUE ($2), $5);
$$ = build_decl_list (TREE_PURPOSE ($2), $$); $$ = build_decl_list (TREE_PURPOSE ($2), $$);
...@@ -2905,6 +2906,9 @@ complex_direct_notype_declarator: ...@@ -2905,6 +2906,9 @@ complex_direct_notype_declarator:
{ $$ = build_parse_node (ARRAY_REF, $$, $3); } { $$ = build_parse_node (ARRAY_REF, $$, $3); }
| direct_notype_declarator '[' ']' | direct_notype_declarator '[' ']'
{ $$ = build_parse_node (ARRAY_REF, $$, NULL_TREE); } { $$ = build_parse_node (ARRAY_REF, $$, NULL_TREE); }
| notype_qualified_id
{ push_nested_class (TREE_TYPE (OP0 ($$)), 3);
TREE_COMPLEXITY ($$) = current_class_depth; }
; ;
qualified_id: qualified_id:
...@@ -3107,7 +3111,7 @@ errstmt: error ';' ...@@ -3107,7 +3111,7 @@ errstmt: error ';'
maybe_label_decls: maybe_label_decls:
/* empty */ /* empty */
| label_decls | label_decls
{ if (flag_ansi) { if (pedantic)
pedwarn ("ANSI C++ forbids label declarations"); } pedwarn ("ANSI C++ forbids label declarations"); }
; ;
...@@ -3323,7 +3327,7 @@ simple_stmt: ...@@ -3323,7 +3327,7 @@ simple_stmt:
register tree label register tree label
= build_decl (LABEL_DECL, NULL_TREE, NULL_TREE); = build_decl (LABEL_DECL, NULL_TREE, NULL_TREE);
if (flag_ansi) if (pedantic)
pedwarn ("ANSI C++ forbids range expressions in switch statement"); pedwarn ("ANSI C++ forbids range expressions in switch statement");
if (value1 != error_mark_node if (value1 != error_mark_node
&& value2 != error_mark_node) && value2 != error_mark_node)
......
gcc/cp/pt.c
...@@ -755,6 +755,8 @@ uses_template_parms (t) ...@@ -755,6 +755,8 @@ uses_template_parms (t)
case REFERENCE_TYPE: case REFERENCE_TYPE:
return uses_template_parms (TREE_TYPE (t)); return uses_template_parms (TREE_TYPE (t));
case RECORD_TYPE: case RECORD_TYPE:
if (TYPE_PTRMEMFUNC_FLAG (t))
return uses_template_parms (TYPE_PTRMEMFUNC_FN_TYPE (t));
case UNION_TYPE: case UNION_TYPE:
if (!TYPE_NAME (t)) if (!TYPE_NAME (t))
return 0; return 0;
...@@ -1153,9 +1155,8 @@ tsubst (t, args, nargs, in_decl) ...@@ -1153,9 +1155,8 @@ tsubst (t, args, nargs, in_decl)
&& type != integer_type_node && type != integer_type_node
&& type != void_type_node && type != void_type_node
&& type != char_type_node) && type != char_type_node)
type = cp_build_type_variant (tsubst (type, args, nargs, in_decl), type = tsubst (type, args, nargs, in_decl);
TYPE_READONLY (type),
TYPE_VOLATILE (type));
switch (TREE_CODE (t)) switch (TREE_CODE (t))
{ {
case RECORD_TYPE: case RECORD_TYPE:
...@@ -1679,12 +1680,16 @@ instantiate_template (tmpl, targ_ptr) ...@@ -1679,12 +1680,16 @@ instantiate_template (tmpl, targ_ptr)
my_friendly_assert (TREE_CODE (tmpl) == TEMPLATE_DECL, 283); my_friendly_assert (TREE_CODE (tmpl) == TEMPLATE_DECL, 283);
len = TREE_VEC_LENGTH (DECL_TEMPLATE_PARMS (tmpl)); len = TREE_VEC_LENGTH (DECL_TEMPLATE_PARMS (tmpl));
i = len;
while (i--)
targ_ptr[i] = copy_to_permanent (targ_ptr[i]);
for (fndecl = DECL_TEMPLATE_INSTANTIATIONS (tmpl); for (fndecl = DECL_TEMPLATE_INSTANTIATIONS (tmpl);
fndecl; fndecl = TREE_CHAIN (fndecl)) fndecl; fndecl = TREE_CHAIN (fndecl))
{ {
tree *t1 = &TREE_VEC_ELT (TREE_PURPOSE (fndecl), 0); tree *t1 = &TREE_VEC_ELT (TREE_PURPOSE (fndecl), 0);
for (i = len - 1; i >= 0; i--) for (i = len - 1; i >= 0; i--)
if (t1[i] != targ_ptr[i]) if (simple_cst_equal (t1[i], targ_ptr[i]) <= 0)
goto no_match; goto no_match;
/* Here, we have a match. */ /* Here, we have a match. */
...@@ -2036,6 +2041,15 @@ type_unification (tparms, targs, parms, args, nsubsts, subr) ...@@ -2036,6 +2041,15 @@ type_unification (tparms, targs, parms, args, nsubsts, subr)
return 1; return 1;
if (arg == unknown_type_node) if (arg == unknown_type_node)
return 1; return 1;
if (! uses_template_parms (parm)
&& TREE_CODE_CLASS (TREE_CODE (arg)) != 't')
{
if (can_convert_arg (parm, TREE_TYPE (arg), arg))
continue;
return 1;
}
#if 0 #if 0
if (TREE_CODE (arg) == VAR_DECL) if (TREE_CODE (arg) == VAR_DECL)
arg = TREE_TYPE (arg); arg = TREE_TYPE (arg);
......
gcc/cp/tree.c
...@@ -1740,6 +1740,9 @@ make_deep_copy (t) ...@@ -1740,6 +1740,9 @@ make_deep_copy (t)
case ARRAY_TYPE: case ARRAY_TYPE:
return build_array_type (make_deep_copy (TREE_TYPE (t)), return build_array_type (make_deep_copy (TREE_TYPE (t)),
make_deep_copy (TYPE_DOMAIN (t))); make_deep_copy (TYPE_DOMAIN (t)));
case INTEGER_TYPE:
return build_index_type (make_deep_copy (TYPE_MAX_VALUE (t)));
case OFFSET_TYPE: case OFFSET_TYPE:
return build_offset_type (make_deep_copy (TYPE_OFFSET_BASETYPE (t)), return build_offset_type (make_deep_copy (TYPE_OFFSET_BASETYPE (t)),
make_deep_copy (TREE_TYPE (t))); make_deep_copy (TREE_TYPE (t)));
...@@ -1749,6 +1752,7 @@ make_deep_copy (t) ...@@ -1749,6 +1752,7 @@ make_deep_copy (t)
build_function_type build_function_type
(make_deep_copy (TREE_TYPE (t)), (make_deep_copy (TREE_TYPE (t)),
make_deep_copy (TREE_CHAIN (TYPE_ARG_TYPES (t))))); make_deep_copy (TREE_CHAIN (TYPE_ARG_TYPES (t)))));
case RECORD_TYPE: case RECORD_TYPE:
if (TYPE_PTRMEMFUNC_P (t)) if (TYPE_PTRMEMFUNC_P (t))
return build_ptrmemfunc_type return build_ptrmemfunc_type
......
gcc/cp/typeck2.c
...@@ -329,7 +329,7 @@ ack (s, v, v2) ...@@ -329,7 +329,7 @@ ack (s, v, v2)
silly. So instead, we just do the equivalent of a call to fatal in the silly. So instead, we just do the equivalent of a call to fatal in the
same situation (call exit). */ same situation (call exit). */
/* First used: 0 (reserved), Last used: 364. Free: */ /* First used: 0 (reserved), Last used: 366. Free: */
static int abortcount = 0; static int abortcount = 0;
...@@ -855,6 +855,14 @@ digest_init (type, init, tail) ...@@ -855,6 +855,14 @@ digest_init (type, init, tail)
} }
init = element; init = element;
} }
while (TREE_CODE (init) == CONSTRUCTOR)
{
cp_pedwarn ("braces around scalar initializer for `%T'", type);
init = CONSTRUCTOR_ELTS (init);
if (TREE_CHAIN (init))
cp_pedwarn ("ignoring extra initializers for `%T'", type);
init = TREE_VALUE (init);
}
return convert_for_initialization (0, type, init, LOOKUP_NORMAL, return convert_for_initialization (0, type, init, LOOKUP_NORMAL,
"initialization", NULL_TREE, 0); "initialization", NULL_TREE, 0);
......
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