3 files changed, 5 insertions, 5 deletions
diff --git a/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p9.cpp b/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p9.cpp
index 5d9f9e7a51..907a91a86e 100644
--- a/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p9.cpp
+++ b/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p9.cpp
@@ -2,11 +2,11 @@
 
 struct S; // expected-note {{forward declaration of 'struct S'}}
 extern S a;
-extern S f();
+extern S f(); // expected-note {{'f' declared here}}
 extern void g(S a); // expected-note {{candidate function}}
 
 void h() {
   // FIXME: This diagnostic could be better.
   g(a); // expected-error {{no matching function for call to 'g'}}
-  f(); // expected-error {{return type of called function ('struct S') is incomplete}}
+  f(); // expected-error {{calling 'f' with incomplete return type 'struct S'}}
 }
diff --git a/test/Sema/incomplete-call.c b/test/Sema/incomplete-call.c
index aedfe50bbf..15d97683c5 100644
--- a/test/Sema/incomplete-call.c
+++ b/test/Sema/incomplete-call.c
@@ -2,12 +2,12 @@
 
 struct foo; // expected-note 3 {{forward declaration of 'struct foo'}}
 
-struct foo a();
+struct foo a(); // expected-note {{'a' declared here}}
 void b(struct foo);
 void c();
 
 void func() {
-  a(); // expected-error{{return type of called function ('struct foo') is incomplete}}
+  a(); // expected-error{{calling 'a' with incomplete return type 'struct foo'}}
   b(*(struct foo*)0); // expected-error{{argument type 'struct foo' is incomplete}}
   c(*(struct foo*)0); // expected-error{{argument type 'struct foo' is incomplete}}
 }
diff --git a/test/SemaCXX/enum.cpp b/test/SemaCXX/enum.cpp
index 431f457259..db256812ab 100644
--- a/test/SemaCXX/enum.cpp
+++ b/test/SemaCXX/enum.cpp
@@ -31,7 +31,7 @@ struct s1 {
 enum e1 { YES, NO };
 
 static enum e1 badfunc(struct s1 *q) {
-  return q->bar(); // expected-error{{return type of called function ('enum s1::e1') is incomplete}}
+  return q->bar(); // expected-error{{calling function with incomplete return type 'enum s1::e1'}}
 }
 
 enum e2; // expected-error{{ISO C++ forbids forward references to 'enum' types}}