diff options
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 2 | ||||
| -rw-r--r-- | test/Parser/MicrosoftExtensions.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 9da28e5d02..7be5e57b6e 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -1172,7 +1172,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, Opts.MicrosoftExt = Args.hasArg(OPT_fms_extensions) || Args.hasArg(OPT_fms_compatibility); Opts.MicrosoftMode = Args.hasArg(OPT_fms_compatibility); - Opts.AsmBlocks = Args.hasArg(OPT_fasm_blocks); + Opts.AsmBlocks = Args.hasArg(OPT_fasm_blocks) || Args.hasArg(OPT_fms_extensions); Opts.MSCVersion = Args.getLastArgIntValue(OPT_fmsc_version, 0, Diags); Opts.Borland = Args.hasArg(OPT_fborland_extensions); Opts.WritableStrings = Args.hasArg(OPT_fwritable_strings); diff --git a/test/Parser/MicrosoftExtensions.c b/test/Parser/MicrosoftExtensions.c index a8e7b8950d..7703999d67 100644 --- a/test/Parser/MicrosoftExtensions.c +++ b/test/Parser/MicrosoftExtensions.c @@ -18,6 +18,15 @@ void * __ptr32 PtrToPtr32(const void *p) return((void * __ptr32) (unsigned __int32) (ULONG_PTR)p ); } +void __forceinline InterlockedBitTestAndSet (long *Base, long Bit) +{ + __asm { // expected-warning {{MS-style inline assembly is not supported}} + mov eax, Bit + mov ecx, Base + lock bts [ecx], eax + setc al + }; +} _inline int foo99() { return 99; } void test_ms_alignof_alias() { |