1 files changed, 5 insertions, 5 deletions
diff --git a/test/SemaCXX/copy-initialization.cpp b/test/SemaCXX/copy-initialization.cpp
index 0c4aa96..fb83dcf 100644
--- a/test/SemaCXX/copy-initialization.cpp
+++ b/test/SemaCXX/copy-initialization.cpp
@@ -10,8 +10,8 @@ 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; // expected-error{{no viable constructor copying variable}}
-  X x3 = ip; // expected-error{{no viable constructor copying variable}}
+  X x2 = 0;
+  X x3 = ip;
   X x4 = fp; // expected-error{{no viable conversion}}
   X x2a(0); // expected-error{{call to constructor of 'X' is ambiguous}}
   X x3a(ip);
@@ -19,11 +19,11 @@ void f(Y y, int *ip, float *fp) {
 }
 
 struct foo {
- void bar();
+ void bar(); // expected-note{{declared here}}
 };
 
 // PR3600
-void test(const foo *P) { P->bar(); } // expected-error{{cannot initialize object parameter of type 'foo' with an expression of type 'foo const'}}
+void test(const foo *P) { P->bar(); } // expected-error{{'bar' not viable: 'this' argument has type 'const foo', but function is not marked const}}
 
 namespace PR6757 {
   struct Foo {
@@ -38,7 +38,7 @@ namespace PR6757 {
   void f(Foo);
 
   void g(Foo foo) {
-    f(Bar()); // expected-error{{no viable constructor copying parameter of type 'PR6757::Foo const'}}
+    f(Bar()); // expected-error{{no viable constructor copying parameter of type 'const PR6757::Foo'}}
     f(foo);
   }
 }