Update clang to r103004.

1 files changed, 11 insertions, 10 deletions

diff --git a/test/SemaCXX/copy-initialization.cpp b/test/SemaCXX/copy-initialization.cpp
index e5b1fd7..0c4aa96 100644
--- a/test/SemaCXX/copy-initialization.cpp
+++ b/test/SemaCXX/copy-initialization.cpp
@@ -1,18 +1,21 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s 
 class X {
 public:
-  explicit X(const X&);
-  X(int*); // expected-note 2{{candidate constructor}}
-  explicit X(float*);
+  explicit X(const X&); // expected-note {{candidate constructor}}
+  X(int*); // expected-note 3{{candidate constructor}}
+  explicit X(float*); // expected-note {{candidate constructor}}
 };
 
 class Y : public X { };
 
 void f(Y y, int *ip, float *fp) {
   X x1 = y; // expected-error{{no matching constructor for initialization of 'X'}}
-  X x2 = 0;
-  X x3 = ip;
+  X x2 = 0; // expected-error{{no viable constructor copying variable}}
+  X x3 = ip; // expected-error{{no viable constructor copying variable}}
   X x4 = fp; // expected-error{{no viable conversion}}
+  X x2a(0); // expected-error{{call to constructor of 'X' is ambiguous}}
+  X x3a(ip);
+  X x4a(fp);
 }
 
 struct foo {
@@ -25,19 +28,17 @@ void test(const foo *P) { P->bar(); } // expected-error{{cannot initialize objec
 namespace PR6757 {
   struct Foo {
     Foo();
-    Foo(Foo&);
+    Foo(Foo&); // expected-note{{candidate constructor not viable}}
   };
 
   struct Bar {
     operator const Foo&() const;
   };
 
-  void f(Foo); // expected-note{{candidate function not viable: no known conversion from 'PR6757::Bar' to 'PR6757::Foo' for 1st argument}}
+  void f(Foo);
 
-  // FIXME: This isn't really the right reason for the failure. We
-  // should fail after overload resolution.
   void g(Foo foo) {
-    f(Bar()); // expected-error{{no matching function for call to 'f'}}
+    f(Bar()); // expected-error{{no viable constructor copying parameter of type 'PR6757::Foo const'}}
     f(foo);
   }
 }