Very nice, thanks for keeping to work on this. On Tue, Jan 22, 2013 at 7:38 PM, Chad Rosier <[email protected]> wrote:
> Author: mcrosier > Date: Tue Jan 22 13:38:32 2013 > New Revision: 173186 > > URL: http://llvm.org/viewvc/llvm-project?rev=173186&view=rev > Log: > [ms-inline asm] Remove the -fenable-experimental-ms-inline-asm flag. > MS-style > inline assembly can be enable with -fasm-blocks or -fms-extensions alone. > > Modified: > cfe/trunk/include/clang/Basic/LangOptions.def > cfe/trunk/include/clang/Driver/Options.td > cfe/trunk/lib/Driver/Tools.cpp > cfe/trunk/lib/Frontend/CompilerInvocation.cpp > cfe/trunk/lib/Parse/ParseStmt.cpp > cfe/trunk/test/CodeGen/ms-inline-asm-64.c > cfe/trunk/test/CodeGen/ms-inline-asm.c > cfe/trunk/test/Driver/clang_f_opts.c > cfe/trunk/test/Sema/ms-inline-asm.c > > Modified: cfe/trunk/include/clang/Basic/LangOptions.def > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/LangOptions.def?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/include/clang/Basic/LangOptions.def (original) > +++ cfe/trunk/include/clang/Basic/LangOptions.def Tue Jan 22 13:38:32 2013 > @@ -164,10 +164,6 @@ > > LANGOPT(ApplePragmaPack, 1, 0, "Apple gcc-compatible #pragma pack > handling") > > -BENIGN_LANGOPT(EmitMicrosoftInlineAsm , 1, 0, > - "Enable emission of MS-style inline assembly.") > - > - > BENIGN_LANGOPT(RetainCommentsFromSystemHeaders, 1, 0, "retain > documentation comments from system headers in the AST") > > #undef LANGOPT > > Modified: cfe/trunk/include/clang/Driver/Options.td > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/include/clang/Driver/Options.td (original) > +++ cfe/trunk/include/clang/Driver/Options.td Tue Jan 22 13:38:32 2013 > @@ -476,8 +476,6 @@ > def fmessage_length_EQ : Joined<["-"], "fmessage-length=">, > Group<f_Group>; > def fms_extensions : Flag<["-"], "fms-extensions">, Group<f_Group>, > Flags<[CC1Option]>, > HelpText<"Accept some non-standard constructs supported by the > Microsoft compiler">; > -def fenable_experimental_ms_inline_asm : Flag<["-"], > "fenable-experimental-ms-inline-asm">, Group<f_Group>, Flags<[CC1Option]>, > - HelpText<"Enable support for Microsoft style inine assembly">; > def fms_compatibility : Flag<["-"], "fms-compatibility">, Group<f_Group>, > Flags<[CC1Option]>, > HelpText<"Enable Microsoft compatibility mode">; > def fmsc_version : Joined<["-"], "fmsc-version=">, Group<f_Group>, > Flags<[CC1Option]>, > > Modified: cfe/trunk/lib/Driver/Tools.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/lib/Driver/Tools.cpp (original) > +++ cfe/trunk/lib/Driver/Tools.cpp Tue Jan 22 13:38:32 2013 > @@ -2715,10 +2715,6 @@ > getToolChain().getTriple().getOS() == > llvm::Triple::Win32)) > CmdArgs.push_back("-fms-extensions"); > > - // -fms-inline-asm. > - if (Args.hasArg(options::OPT_fenable_experimental_ms_inline_asm)) > - CmdArgs.push_back("-fenable-experimental-ms-inline-asm"); > - > // -fms-compatibility=0 is default. > if (Args.hasFlag(options::OPT_fms_compatibility, > options::OPT_fno_ms_compatibility, > > Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original) > +++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Tue Jan 22 13:38:32 2013 > @@ -1265,8 +1265,6 @@ > Opts.FastMath = Args.hasArg(OPT_ffast_math); > Opts.FiniteMathOnly = Args.hasArg(OPT_ffinite_math_only); > > - Opts.EmitMicrosoftInlineAsm = > Args.hasArg(OPT_fenable_experimental_ms_inline_asm); > - > Opts.RetainCommentsFromSystemHeaders = > Args.hasArg(OPT_fretain_comments_from_system_headers); > > > Modified: cfe/trunk/lib/Parse/ParseStmt.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseStmt.cpp?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/lib/Parse/ParseStmt.cpp (original) > +++ cfe/trunk/lib/Parse/ParseStmt.cpp Tue Jan 22 13:38:32 2013 > @@ -1771,21 +1771,6 @@ > return StmtError(); > } > > - // If MS-style inline assembly is disabled, then build an empty asm. > - if (!getLangOpts().EmitMicrosoftInlineAsm) { > - Token t; > - t.setKind(tok::string_literal); > - t.setLiteralData("\"/*FIXME: not done*/\""); > - t.clearFlag(Token::NeedsCleaning); > - t.setLength(21); > - ExprResult AsmString(Actions.ActOnStringLiteral(&t, 1)); > - ExprVector Constraints; > - ExprVector Exprs; > - ExprVector Clobbers; > - return Actions.ActOnGCCAsmStmt(AsmLoc, true, true, 0, 0, 0, > Constraints, > - Exprs, AsmString.take(), Clobbers, > EndLoc); > - } > - > // FIXME: We should be passing source locations for better diagnostics. > return Actions.ActOnMSAsmStmt(AsmLoc, LBraceLoc, > llvm::makeArrayRef(AsmToks), EndLoc); > > Modified: cfe/trunk/test/CodeGen/ms-inline-asm-64.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-inline-asm-64.c?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/test/CodeGen/ms-inline-asm-64.c (original) > +++ cfe/trunk/test/CodeGen/ms-inline-asm-64.c Tue Jan 22 13:38:32 2013 > @@ -1,5 +1,5 @@ > // REQUIRES: x86-64-registered-target > -// RUN: %clang_cc1 %s -triple x86_64-apple-darwin10 -O0 -fasm-blocks > -fenable-experimental-ms-inline-asm -w -emit-llvm -o - | FileCheck %s > +// RUN: %clang_cc1 %s -triple x86_64-apple-darwin10 -O0 -fasm-blocks > -emit-llvm -o - | FileCheck %s > > void t1() { > int var = 10; > > Modified: cfe/trunk/test/CodeGen/ms-inline-asm.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-inline-asm.c?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/test/CodeGen/ms-inline-asm.c (original) > +++ cfe/trunk/test/CodeGen/ms-inline-asm.c Tue Jan 22 13:38:32 2013 > @@ -1,5 +1,5 @@ > // REQUIRES: x86-64-registered-target > -// RUN: %clang_cc1 %s -triple i386-apple-darwin10 -O0 -fasm-blocks > -fenable-experimental-ms-inline-asm -w -emit-llvm -o - | FileCheck %s > +// RUN: %clang_cc1 %s -triple i386-apple-darwin10 -O0 -fasm-blocks > -emit-llvm -o - | FileCheck %s > > void t1() { > // CHECK: @t1 > > Modified: cfe/trunk/test/Driver/clang_f_opts.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/clang_f_opts.c?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/test/Driver/clang_f_opts.c (original) > +++ cfe/trunk/test/Driver/clang_f_opts.c Tue Jan 22 13:38:32 2013 > @@ -36,9 +36,6 @@ > // FP-CONTRACT-FAST-CHECK: -ffp-contract=fast > // FP-CONTRACT-OFF-CHECK: -ffp-contract=off > > -// RUN: %clang -fms-extensions -fenable-experimental-ms-inline-asm %s > -### 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS3 %s > -// CHECK-OPTIONS3: -fenable-experimental-ms-inline-asm > - > // RUN: %clang -### -S -fvectorize %s 2>&1 | FileCheck > -check-prefix=CHECK-VECTORIZE %s > // RUN: %clang -### -S -fno-vectorize -fvectorize %s 2>&1 | FileCheck > -check-prefix=CHECK-VECTORIZE %s > // RUN: %clang -### -S -fno-vectorize %s 2>&1 | FileCheck > -check-prefix=CHECK-NO-VECTORIZE %s > > Modified: cfe/trunk/test/Sema/ms-inline-asm.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/ms-inline-asm.c?rev=173186&r1=173185&r2=173186&view=diff > > ============================================================================== > --- cfe/trunk/test/Sema/ms-inline-asm.c (original) > +++ cfe/trunk/test/Sema/ms-inline-asm.c Tue Jan 22 13:38:32 2013 > @@ -1,5 +1,5 @@ > // REQUIRES: x86-64-registered-target > -// RUN: %clang_cc1 %s -triple x86_64-apple-darwin10 -fasm-blocks > -fenable-experimental-ms-inline-asm -Wno-microsoft -verify -fsyntax-only > +// RUN: %clang_cc1 %s -triple x86_64-apple-darwin10 -fasm-blocks > -Wno-microsoft -verify -fsyntax-only > > void t1(void) { > __asm __asm // expected-error {{__asm used with no assembly > instructions}} > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits > -- João Matos
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
