Speculatively revert r103497, "Do not mark the virtual members of an

implicitly-instantiated class as ...", which seems to have broken bootstrap.

llvm-svn: 103515

1 files changed, 4 insertions, 9 deletions

diff --git a/clang/test/SemaCXX/default-assignment-operator.cpp b/clang/test/SemaCXX/default-assignment-operator.cpp
index 0be5df39b15..4b5531e0c87 100644
--- a/clang/test/SemaCXX/default-assignment-operator.cpp
+++ b/clang/test/SemaCXX/default-assignment-operator.cpp
@@ -7,8 +7,7 @@ class Base { // expected-error {{cannot define the implicit default assignment o
 };
 
 class X  : Base {  // // expected-error {{cannot define the implicit default assignment operator for 'X', because non-static const member 'cint' can't use default assignment operator}} \
-// expected-note{{assignment operator for 'Base' first required here}} \
-  // expected-note{{implicit default copy assignment operator}}
+// expected-note{{assignment operator for 'Base' first required here}}
 public: 
   X();
   const int cint;  // expected-note {{declared here}}
@@ -29,8 +28,7 @@ Z z2;
 
 // Test1
 void f(X x, const X cx) {
-  x = cx; // expected-note{{assignment operator for 'X' first required here}} \
-  // expected-note{{implicit default copy assignment operator}}
+  x = cx; // expected-note{{assignment operator for 'X' first required here}}
   x = cx;
   z1 = z2;
 }
@@ -86,9 +84,7 @@ public:
 E1 e1, e2;
 
 void j() {
-  // FIXME: duplicated!
-  e1 = e2; // expected-note{{assignment operator for 'E1' first required here}} \
-  // expected-note{{implicit default copy assignment operator}}
+  e1 = e2; // expected-note{{assignment operator for 'E1' first required here}}
 }
 
 namespace ProtectedCheck {
@@ -105,8 +101,7 @@ namespace ProtectedCheck {
     X x;
   };
 
-  void f(Z z) { z = z; }  // expected-note{{implicit default copy assignment operator}}
-
+  void f(Z z) { z = z; } // 
 }
 
 namespace MultiplePaths {