OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl2.c (import_export_decl): Use same_type_p, rather than relying on pointer-equality for types. 

* decl2.c (import_export_decl): Use same_type_p, rather than
	relying on pointer-equality for types.
	* method.c (do_build_copy_constructor): Simplify.

From-SVN: r27555
This commit is contained in:
Mark Mitchell 1999-06-16 17:48:05 +00:00 committed by Mark Mitchell
parent 78d114ef2d
commit 1b5f5f763a
5 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,5 +1,10 @@
1999-06-16 Mark Mitchell <mark@codesourcery.com>
* decl2.c (import_export_decl): Use same_type_p, rather than
relying on pointer-equality for types.
* method.c (do_build_copy_constructor): Simplify.
* call.c (build_method_call): Remove bogus code for two-argument
delete.
* init.c (build_new_1): Expand on comment, and remove dead code.

5
gcc/cp/decl2.c
View File

@ -2807,7 +2807,7 @@ import_export_decl (decl)
since it will not be emitted when the vtable for the type
is output (which is when the unqualified version is
generated). */
&& ctype == TYPE_MAIN_VARIANT (ctype))
&& same_type_p (ctype, TYPE_MAIN_VARIANT (ctype)))
{
DECL_NOT_REALLY_EXTERN (decl)
= ! (CLASSTYPE_INTERFACE_ONLY (ctype)
@ -2818,7 +2818,8 @@ import_export_decl (decl)
if (flag_weak)
comdat_linkage (decl);
}
else if (TYPE_BUILT_IN (ctype) && ctype == TYPE_MAIN_VARIANT (ctype))
else if (TYPE_BUILT_IN (ctype)
&& same_type_p (ctype, TYPE_MAIN_VARIANT (ctype)))
DECL_NOT_REALLY_EXTERN (decl) = 0;
else
comdat_linkage (decl);

37
gcc/cp/method.c
View File

@ -2231,42 +2231,21 @@ do_build_copy_constructor (fndecl)
tree binfos = TYPE_BINFO_BASETYPES (current_class_type);
int i;
/* Initialize all the base-classes. */
for (t = CLASSTYPE_VBASECLASSES (current_class_type); t;
t = TREE_CHAIN (t))
{
tree basetype = BINFO_TYPE (t);
tree p = convert_to_reference
(build_reference_type (basetype), parm,
CONV_IMPLICIT|CONV_CONST, LOOKUP_COMPLAIN, NULL_TREE);
p = convert_from_reference (p);
if (p == error_mark_node)
cp_error ("in default copy constructor");
else
current_base_init_list = tree_cons (basetype,
p, current_base_init_list);
}
current_base_init_list
= tree_cons (BINFO_TYPE (t), parm, current_base_init_list);
for (i = 0; i < n_bases; ++i)
{
tree p, basetype = TREE_VEC_ELT (binfos, i);
if (TREE_VIA_VIRTUAL (basetype))
t = TREE_VEC_ELT (binfos, i);
if (TREE_VIA_VIRTUAL (t))
continue;
basetype = BINFO_TYPE (basetype);
p = convert_to_reference
(build_reference_type (basetype), parm,
CONV_IMPLICIT|CONV_CONST, LOOKUP_COMPLAIN, NULL_TREE);
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);
}
current_base_init_list
= tree_cons (BINFO_TYPE (t), parm, current_base_init_list);
}
for (; fields; fields = TREE_CHAIN (fields))
{
tree init, t;

11
gcc/testsuite/g++.old-deja/g++.eh/catch2.C Normal file
View File

@ -0,0 +1,11 @@
// Build don't link:
// Origin: Mike Danylchuk <miked@mpath.com>
typedef char TCHAR;
int main()
{
try {}
catch( TCHAR* Err ) {}
}

21
gcc/testsuite/g++.old-deja/g++.other/copy2.C Normal file
View File

@ -0,0 +1,21 @@
// Origin: Mark Mitchell <mark@codesourcery.com>
int i;
struct B {
B () {}
B (B&) { i = 1; }
B (const B&) { i = 2; }
};
struct D : public B {
D () {}
};
int main ()
{
D d;
D d2 (d);
if (i != 2)
return 1;
}