Revert r88718, which does NOT solve the constructor-template-as-copy-constructor issue. Big thanks to John for finding this

llvm-svn: 88724
diff --git a/clang/test/SemaCXX/copy-constructor-error.cpp b/clang/test/SemaCXX/copy-constructor-error.cpp
index c50a157..2e42fcc 100644
--- a/clang/test/SemaCXX/copy-constructor-error.cpp
+++ b/clang/test/SemaCXX/copy-constructor-error.cpp
@@ -1,11 +1,13 @@
 // RUN: clang-cc -fsyntax-only -verify %s 
 
-struct S {
-   S (S);  // expected-error {{copy constructor must pass its first argument by reference}}
+struct S { // expected-note {{candidate function}} 
+   S (S);  // expected-error {{copy constructor must pass its first argument by reference}} \\
+           // expected-note {{candidate function}}
 };
 
 S f();
 
 void g() { 
-  S a( f() );  // expected-error {{no matching constructor}}
+  S a( f() );  // expected-error {{call to constructor of 'a' is ambiguous}}
 }
+