diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 939b05af362..cab1040c6dd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-11-05 Jason Merrill + + PR c++/45473 + * search.c (look_for_overrides): A constructor is never virtual. + 2010-11-05 Jakub Jelinek PR c++/46160 diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 0249fb06d48..370ddf636c3 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1935,6 +1935,11 @@ look_for_overrides (tree type, tree fndecl) int ix; int found = 0; + /* A constructor for a class T does not override a function T + in a base class. */ + if (DECL_CONSTRUCTOR_P (fndecl)) + return 0; + for (ix = 0; BINFO_BASE_ITERATE (binfo, ix, base_binfo); ix++) { tree basetype = BINFO_TYPE (base_binfo); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0cc58bf84af..dbde8313206 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-05 Jason Merrill + + PR c++/45473 + * g++.dg/inherit/virtual6.C: New. + 2010-11-05 Jakub Jelinek PR c/44772 diff --git a/gcc/testsuite/g++.dg/inherit/virtual6.C b/gcc/testsuite/g++.dg/inherit/virtual6.C new file mode 100644 index 00000000000..f0369699321 --- /dev/null +++ b/gcc/testsuite/g++.dg/inherit/virtual6.C @@ -0,0 +1,15 @@ +// PR c++/45473 + +struct A +{ + virtual void B (); +}; + +struct B : A +{ + B (); +}; + +struct C : B +{ +};