Vendor import of clang trunk r154661:

http://llvm.org/svn/llvm-project/cfe/trunk@r154661

1 files changed, 6 insertions, 2 deletions

diff --git a/test/Parser/cxx-condition.cpp b/test/Parser/cxx-condition.cpp
index 552d823..5672eea 100644
--- a/test/Parser/cxx-condition.cpp
+++ b/test/Parser/cxx-condition.cpp
@@ -1,11 +1,15 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 
+struct S { S(int); operator bool(); };
+
 void f() {
   int a;
   while (a) ;
-  while (int x) ; // expected-error {{expected '=' after declarator}}
+  while (int x) ; // expected-error {{variable declaration in condition must have an initializer}}
   while (float x = 0) ;
-  if (const int x = a) ; // expected-warning{{empty body}}
+  if (const int x = a) ; // expected-warning{{empty body}} expected-note{{put the semicolon on a separate line to silence this warning}}
   switch (int x = a+10) {}
   for (; int x = ++a; ) ;
+
+  if (S a(42)) {} // expected-error {{variable declaration in condition cannot have a parenthesized initializer}}
 }