3 files changed, 25 insertions, 1 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 7800fb5189..97ff07049f 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -493,7 +493,6 @@ static void InitializePredefinedMacros(Preprocessor &PP,
     DefineBuiltinMacro(Buf, "__int16=short");
     DefineBuiltinMacro(Buf, "__int32=int");
     DefineBuiltinMacro(Buf, "__int64=long long");
-    DefineBuiltinMacro(Buf, "__declspec(X)=");
   }
   
   
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index c7f92cf014..a8052dc290 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -192,6 +192,20 @@ AttributeList *Parser::ParseAttributes() {
   return CurrAttr;
 }
 
+/// FuzzyParseMicrosoftDeclSpec. When -fms-extensions is enabled, this
+/// routine is called to skip/ignore tokens that comprise the MS declspec.
+void Parser::FuzzyParseMicrosoftDeclSpec() {
+  assert(Tok.is(tok::kw___declspec) && "Not a declspec!");
+  ConsumeToken();
+  if (Tok.is(tok::l_paren)) {
+    unsigned short savedParenCount = ParenCount;
+    do {
+      ConsumeAnyToken();
+    } while (ParenCount > savedParenCount && Tok.isNot(tok::eof));
+  } 
+  return;
+}
+
 /// ParseDeclaration - Parse a full 'declaration', which consists of
 /// declaration-specifiers, some number of declarators, and a semicolon.
 /// 'Context' should be a Declarator::TheContext value.
@@ -538,6 +552,13 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
     case tok::kw___attribute:
       DS.AddAttributes(ParseAttributes());
       continue;
+
+    // Microsoft declspec support.
+    case tok::kw___declspec:
+      if (!PP.getLangOptions().Microsoft)
+        goto DoneWithDeclSpec;
+      FuzzyParseMicrosoftDeclSpec();
+      continue;
       
     // storage-class-specifier
     case tok::kw_typedef:
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 1b0b811c88..1d3de90060 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -220,6 +220,10 @@ void Parser::ParseClassSpecifier(DeclSpec &DS,
   if (Tok.is(tok::kw___attribute))
     Attr = ParseAttributes();
 
+  // If declspecs exist after tag, parse them.
+  if (Tok.is(tok::kw___declspec) && PP.getLangOptions().Microsoft)
+    FuzzyParseMicrosoftDeclSpec();
+  
   // Parse the (optional) nested-name-specifier.
   CXXScopeSpec SS;
   if (getLang().CPlusPlus && MaybeParseCXXScopeSpecifier(SS)) {