summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2009-12-02 06:59:20 +0000
committerEli Friedman <eli.friedman@gmail.com>2009-12-02 06:59:20 +0000
commit81bce6b05ed17fc61bdfcd42dff191503d99fce5 (patch)
treec8fc4f868014e8518146e7e8b504d5aaca05943c
parent53ad6b94b0fdce48638434e9b280544e7f983285 (diff)
downloadbcm5719-llvm-81bce6b05ed17fc61bdfcd42dff191503d99fce5.tar.gz
bcm5719-llvm-81bce6b05ed17fc61bdfcd42dff191503d99fce5.zip
Make sure to call AddOverriddenMethods for implicit copy assignment operators;
it's rare, but possible, for the difference to be significant. llvm-svn: 90301
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp1
-rw-r--r--clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp10
2 files changed, 11 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 3dad051a4e8..7df86ee66c3 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -2149,6 +2149,7 @@ void Sema::AddImplicitlyDeclaredMembersToClass(CXXRecordDecl *ClassDecl) {
// Don't call addedAssignmentOperator. There is no way to distinguish an
// implicit from an explicit assignment operator.
ClassDecl->addDecl(CopyAssignment);
+ AddOverriddenMethods(ClassDecl, CopyAssignment);
}
if (!ClassDecl->hasUserDeclaredDestructor()) {
diff --git a/clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp b/clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp
new file mode 100644
index 00000000000..e99b9e67510
--- /dev/null
+++ b/clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp
@@ -0,0 +1,10 @@
+// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+
+struct D;
+struct B {
+ virtual D& operator = (const D&);
+};
+struct D : B { D(); virtual void a(); };
+void D::a() {}
+
+// CHECK: @_ZTV1D = {{.*}} @_ZN1DaSERKS_
OpenPOWER on IntegriCloud