[cfe-commits] r151923 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/Sema/variadic-incomplete-arg-type.c

[Fariborz Jahanian]

Author: fjahanian
Date: Fri Mar  2 11:05:03 2012
New Revision: 151923

URL: http://llvm.org/viewvc/llvm-project?rev=151923&view=rev
Log:
Change diagnostic test for my last patch.
// rdar://10961370

Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/test/Sema/variadic-incomplete-arg-type.c

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=151923&r1=151922&r2=151923&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Fri Mar  2 11:05:03 2012
@@ -587,11 +587,10 @@
       E = Comma.get();
     }
   }
-  // c++ rules are enfroced elsewhere.
+  // c++ rules are enforced elsewhere.
   if (!getLangOptions().CPlusPlus &&
-      !E->getType()->isVoidType() &&
       RequireCompleteType(E->getExprLoc(), E->getType(),
-                          diag::err_incomplete_type))
+                          diag::err_call_incomplete_argument))
     return ExprError();
   
   return Owned(E);

Modified: cfe/trunk/test/Sema/variadic-incomplete-arg-type.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/variadic-incomplete-arg-type.c?rev=151923&r1=151922&r2=151923&view=diff
==============================================================================
--- cfe/trunk/test/Sema/variadic-incomplete-arg-type.c (original)
+++ cfe/trunk/test/Sema/variadic-incomplete-arg-type.c Fri Mar  2 11:05:03 2012
@@ -8,5 +8,6 @@
 int main()
 {
  CFErrorRef error;
- junk(1, *error); // expected-error {{incomplete type 'struct __CFError' where a complete type is required}}
+ junk(1, *error, (void)0); // expected-error {{argument type 'struct __CFError' is incomplete}} \
+                           // expected-error {{argument type 'void' is incomplete}}
 }