commit 86bc6cf05ad3ff7198671c394ba5157974e8a39c
author Steve Naroff <snaroff@apple.com> Thu Dec 25 14:41:26 2008 +0000
committer Steve Naroff <snaroff@apple.com> Thu Dec 25 14:41:26 2008 +0000
tree ab9a106a8267e5eb4e43adfe3dba5b9692225a2e
parent 239f07384fe5e7194e780d98a17553084efeeb44

Add parser support for __forceinline, __w64, __ptr64.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61431 91177308-0d34-0410-b5e6-96231b3b80d8

include/clang/Basic/TokenKinds.def

diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def
index 686c1b5..01a85c0 100644
--- a/include/clang/Basic/TokenKinds.def
+++ b/include/clang/Basic/TokenKinds.def
@@ -312,6 +312,9 @@
 KEYWORD(__cdecl                     , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
 KEYWORD(__stdcall                   , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
 KEYWORD(__fastcall                  , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
+KEYWORD(__ptr64                     , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
+KEYWORD(__w64                       , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
+KEYWORD(__forceinline               , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
 
 // Alternate spelling for various tokens.  There are GCC extensions in all
 // languages, but should not be disabled in strict conformance mode.

lib/Lex/Preprocessor.cpp

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index e68a44c..aa2944f 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -484,9 +484,6 @@
   // mode. 
   if (PP.getLangOptions().Microsoft) {
     DefineBuiltinMacro(Buf, "_cdecl=__cdecl");
-    DefineBuiltinMacro(Buf, "__ptr64=");
-    DefineBuiltinMacro(Buf, "__w64=");
-    DefineBuiltinMacro(Buf, "__forceinline=");
     DefineBuiltinMacro(Buf, "__int8=char");
     DefineBuiltinMacro(Buf, "__int16=short");
     DefineBuiltinMacro(Buf, "__int32=int");

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index bf75ab0..e3fd696 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -561,6 +561,8 @@
       continue;
       
     // Microsoft single token adornments.
+    case tok::kw___forceinline:
+    case tok::kw___w64:
     case tok::kw___cdecl:
     case tok::kw___stdcall:
     case tok::kw___fastcall:
@@ -1322,6 +1324,7 @@
       isInvalid = DS.SetTypeQual(DeclSpec::TQ_restrict, Loc, PrevSpec,
                                  getLang())*2;
       break;
+    case tok::kw___ptr64:
     case tok::kw___cdecl:
     case tok::kw___stdcall:
     case tok::kw___fastcall:

test/Parser/MicrosoftExtensions.c

diff --git a/test/Parser/MicrosoftExtensions.c b/test/Parser/MicrosoftExtensions.c
index dc26c57..0ff59f7 100644
--- a/test/Parser/MicrosoftExtensions.c
+++ b/test/Parser/MicrosoftExtensions.c
@@ -6,3 +6,18 @@
 extern __declspec(dllimport) void __stdcall VarR4FromDec();
 __declspec(deprecated) __declspec(deprecated) char * __cdecl ltoa( long _Val, char * _DstBuf, int _Radix);
 __declspec(noalias) __declspec(restrict) void * __cdecl xxx( void * _Memory );
+typedef __w64 unsigned long ULONG_PTR, *PULONG_PTR;
+void * __ptr64 PtrToPtr64(const void *p)
+{
+    return((void * __ptr64) (unsigned __int64) (ULONG_PTR)p );
+}
+__forceinline InterlockedBitTestAndSet (long *Base, long Bit)
+{
+    __asm {
+           mov eax, Bit
+           mov ecx, Base
+           lock bts [ecx], eax
+           setc al
+    };
+}
+