Allow multiple Microsoft calling-convention keywords. Fixes rdar://problem/6486133

llvm-svn: 62018

2 files changed, 4 insertions, 2 deletions

diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index ac1a4be8456..3ec1764612a 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -1735,8 +1735,8 @@ void Parser::ParseParenDeclarator(Declarator &D) {
     RequiresArg = true;
   }
   // Eat any Microsoft extensions.
-  if ((Tok.is(tok::kw___cdecl) || Tok.is(tok::kw___stdcall) ||
-      (Tok.is(tok::kw___fastcall))) && PP.getLangOptions().Microsoft)
+  while ((Tok.is(tok::kw___cdecl) || Tok.is(tok::kw___stdcall) ||
+          (Tok.is(tok::kw___fastcall))) && PP.getLangOptions().Microsoft)
     ConsumeToken();
   
   // If we haven't past the identifier yet (or where the identifier would be
diff --git a/clang/test/Parser/MicrosoftExtensions.c b/clang/test/Parser/MicrosoftExtensions.c
index beeef0a9f55..27283de79cc 100644
--- a/clang/test/Parser/MicrosoftExtensions.c
+++ b/clang/test/Parser/MicrosoftExtensions.c
@@ -26,3 +26,5 @@ void *_alloca(int);
 void foo() {
 	__declspec(align(16)) int *buffer = (int *)_alloca(9);
 }
+
+typedef bool (__stdcall __stdcall *blarg)(int);