revert r123977 and r123978 to fix PR9026.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124033 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1 insertions, 4 deletions

diff --git a/test/SemaCXX/conditional-expr.cpp b/test/SemaCXX/conditional-expr.cpp
index efda4ce97a..a7f2a4c915 100644
--- a/test/SemaCXX/conditional-expr.cpp
+++ b/test/SemaCXX/conditional-expr.cpp
@@ -7,10 +7,7 @@
 struct ToBool { explicit operator bool(); };
 
 struct B;
-struct A { // expected-note 2{{candidate is the implicit copy constructor}}
-  A(); 
-  A(const B&); // expected-note 2 {{candidate constructor}}
-}; 
+struct A { A(); A(const B&); }; // expected-note 2 {{candidate constructor}}
 struct B { operator A() const; }; // expected-note 2 {{candidate function}}
 struct I { operator int(); };
 struct J { operator I(); };