This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG1e6fc2fa532c: [clang][cli] Port Migrator option flags to new
option parsing system (authored by jansvoboda11).
Changed prior to commit:
https://reviews.llvm.org/D83690?vs=277473&id=306033#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D83690/new/
https://reviews.llvm.org/D83690
Files:
clang/include/clang/Driver/Options.td
clang/lib/Frontend/CompilerInvocation.cpp
Index: clang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- clang/lib/Frontend/CompilerInvocation.cpp
+++ clang/lib/Frontend/CompilerInvocation.cpp
@@ -683,12 +683,6 @@
<< "a filename";
}
-static bool ParseMigratorArgs(MigratorOptions &Opts, ArgList &Args) {
- Opts.NoNSAllocReallocError = Args.hasArg(OPT_migrator_no_nsalloc_error);
- Opts.NoFinalizeRemoval = Args.hasArg(OPT_migrator_no_finalize_removal);
- return true;
-}
-
static void ParseCommentArgs(CommentOptions &Opts, ArgList &Args) {
Opts.BlockCommandNames = Args.getAllArgValues(OPT_fcomment_block_commands);
Opts.ParseAllComments = Args.hasArg(OPT_fparse_all_comments);
@@ -3838,7 +3832,6 @@
FixupInvocation(Res);
Success &= ParseAnalyzerArgs(*Res.getAnalyzerOpts(), Args, Diags);
- Success &= ParseMigratorArgs(Res.getMigratorOpts(), Args);
ParseDependencyOutputArgs(Res.getDependencyOutputOpts(), Args);
if (!Res.getDependencyOutputOpts().OutputFile.empty() &&
Res.getDependencyOutputOpts().Targets.empty()) {
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -3791,10 +3791,12 @@
// Migrator Options
//===----------------------------------------------------------------------===//
def migrator_no_nsalloc_error : Flag<["-"], "no-ns-alloc-error">,
- HelpText<"Do not error on use of
NSAllocateCollectable/NSReallocateCollectable">;
+ HelpText<"Do not error on use of
NSAllocateCollectable/NSReallocateCollectable">,
+ MarshallingInfoFlag<"MigratorOpts.NoNSAllocReallocError">;
def migrator_no_finalize_removal : Flag<["-"], "no-finalize-removal">,
- HelpText<"Do not remove finalize method in gc mode">;
+ HelpText<"Do not remove finalize method in gc mode">,
+ MarshallingInfoFlag<"MigratorOpts.NoFinalizeRemoval">;
//===----------------------------------------------------------------------===//
// CodeGen Options
Index: clang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- clang/lib/Frontend/CompilerInvocation.cpp
+++ clang/lib/Frontend/CompilerInvocation.cpp
@@ -683,12 +683,6 @@
<< "a filename";
}
-static bool ParseMigratorArgs(MigratorOptions &Opts, ArgList &Args) {
- Opts.NoNSAllocReallocError = Args.hasArg(OPT_migrator_no_nsalloc_error);
- Opts.NoFinalizeRemoval = Args.hasArg(OPT_migrator_no_finalize_removal);
- return true;
-}
-
static void ParseCommentArgs(CommentOptions &Opts, ArgList &Args) {
Opts.BlockCommandNames = Args.getAllArgValues(OPT_fcomment_block_commands);
Opts.ParseAllComments = Args.hasArg(OPT_fparse_all_comments);
@@ -3838,7 +3832,6 @@
FixupInvocation(Res);
Success &= ParseAnalyzerArgs(*Res.getAnalyzerOpts(), Args, Diags);
- Success &= ParseMigratorArgs(Res.getMigratorOpts(), Args);
ParseDependencyOutputArgs(Res.getDependencyOutputOpts(), Args);
if (!Res.getDependencyOutputOpts().OutputFile.empty() &&
Res.getDependencyOutputOpts().Targets.empty()) {
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -3791,10 +3791,12 @@
// Migrator Options
//===----------------------------------------------------------------------===//
def migrator_no_nsalloc_error : Flag<["-"], "no-ns-alloc-error">,
- HelpText<"Do not error on use of NSAllocateCollectable/NSReallocateCollectable">;
+ HelpText<"Do not error on use of NSAllocateCollectable/NSReallocateCollectable">,
+ MarshallingInfoFlag<"MigratorOpts.NoNSAllocReallocError">;
def migrator_no_finalize_removal : Flag<["-"], "no-finalize-removal">,
- HelpText<"Do not remove finalize method in gc mode">;
+ HelpText<"Do not remove finalize method in gc mode">,
+ MarshallingInfoFlag<"MigratorOpts.NoFinalizeRemoval">;
//===----------------------------------------------------------------------===//
// CodeGen Options
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
