This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGd1b3f82e5137: [clang][cli] Port PreprocessorOpts simple
string based options to new option… (authored by jansvoboda11).
Changed prior to commit:
https://reviews.llvm.org/D84672?vs=312205&id=312709#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D84672/new/
https://reviews.llvm.org/D84672
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
@@ -3115,11 +3115,8 @@
static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args,
DiagnosticsEngine &Diags,
frontend::ActionKind Action) {
- Opts.ImplicitPCHInclude = std::string(Args.getLastArgValue(OPT_include_pch));
Opts.PCHWithHdrStop = Args.hasArg(OPT_pch_through_hdrstop_create) ||
Args.hasArg(OPT_pch_through_hdrstop_use);
- Opts.PCHThroughHeader =
- std::string(Args.getLastArgValue(OPT_pch_through_header_EQ));
Opts.AllowPCHWithCompilerErrors =
Args.hasArg(OPT_fallow_pch_with_errors, OPT_fallow_pcm_with_errors);
@@ -3187,19 +3184,6 @@
Opts.addRemappedFile(Split.first, Split.second);
}
- if (Arg *A = Args.getLastArg(OPT_fobjc_arc_cxxlib_EQ)) {
- StringRef Name = A->getValue();
- unsigned Library = llvm::StringSwitch<unsigned>(Name)
- .Case("libc++", ARCXX_libcxx)
- .Case("libstdc++", ARCXX_libstdcxx)
- .Case("none", ARCXX_nolib)
- .Default(~0U);
- if (Library == ~0U)
- Diags.Report(diag::err_drv_invalid_value) << A->getAsString(Args) <<
Name;
- else
- Opts.ObjCXXARCStandardLibrary = (ObjCXXARCStandardLibraryKind)Library;
- }
-
// Always avoid lexing editor placeholders when we're just running the
// preprocessor as we never want to emit the
// "editor placeholder in source file" error in PP only mode.
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2615,7 +2615,8 @@
def include_ : JoinedOrSeparate<["-", "--"], "include">, Group<clang_i_Group>,
EnumName<"include">,
MetaVarName<"<file>">, HelpText<"Include file before parsing">,
Flags<[CC1Option]>;
def include_pch : Separate<["-"], "include-pch">, Group<clang_i_Group>,
Flags<[CC1Option]>,
- HelpText<"Include precompiled header file">, MetaVarName<"<file>">;
+ HelpText<"Include precompiled header file">, MetaVarName<"<file>">,
+ MarshallingInfoString<"PreprocessorOpts->ImplicitPCHInclude">;
def relocatable_pch : Flag<["-", "--"], "relocatable-pch">, Flags<[CC1Option]>,
HelpText<"Whether to build a relocatable precompiled header">,
MarshallingInfoFlag<"FrontendOpts.RelocatablePCH">;
@@ -4857,7 +4858,8 @@
HelpText<"Override record layouts with those in the given file">;
def pch_through_header_EQ : Joined<["-"], "pch-through-header=">,
HelpText<"Stop PCH generation after including this file. When using a PCH, "
- "skip tokens until after this file is included.">;
+ "skip tokens until after this file is included.">,
+ MarshallingInfoString<"PreprocessorOpts->PCHThroughHeader">;
def pch_through_hdrstop_create : Flag<["-"], "pch-through-hdrstop-create">,
HelpText<"When creating a PCH, stop PCH generation after #pragma hdrstop.">,
MarshallingInfoFlag<"PreprocessorOpts->PCHWithHdrStopCreate">;
@@ -4904,7 +4906,9 @@
HelpText<"Specify the class to use for constant Objective-C string
objects.">,
MarshallingInfoString<"LangOpts->ObjCConstantStringClass">;
def fobjc_arc_cxxlib_EQ : Joined<["-"], "fobjc-arc-cxxlib=">,
- HelpText<"Objective-C++ Automatic Reference Counting standard library
kind">, Values<"libc++,libstdc++,none">;
+ HelpText<"Objective-C++ Automatic Reference Counting standard library
kind">, Values<"libc++,libstdc++,none">,
+ NormalizedValues<["ARCXX_libcxx", "ARCXX_libstdcxx", "ARCXX_nolib"]>,
+ MarshallingInfoString<"PreprocessorOpts->ObjCXXARCStandardLibrary",
"ARCXX_nolib">, AutoNormalizeEnum;
def fobjc_runtime_has_weak : Flag<["-"], "fobjc-runtime-has-weak">,
HelpText<"The target Objective-C runtime supports ARC weak operations">;
def fobjc_dispatch_method_EQ : Joined<["-"], "fobjc-dispatch-method=">,
Index: clang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- clang/lib/Frontend/CompilerInvocation.cpp
+++ clang/lib/Frontend/CompilerInvocation.cpp
@@ -3115,11 +3115,8 @@
static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args,
DiagnosticsEngine &Diags,
frontend::ActionKind Action) {
- Opts.ImplicitPCHInclude = std::string(Args.getLastArgValue(OPT_include_pch));
Opts.PCHWithHdrStop = Args.hasArg(OPT_pch_through_hdrstop_create) ||
Args.hasArg(OPT_pch_through_hdrstop_use);
- Opts.PCHThroughHeader =
- std::string(Args.getLastArgValue(OPT_pch_through_header_EQ));
Opts.AllowPCHWithCompilerErrors =
Args.hasArg(OPT_fallow_pch_with_errors, OPT_fallow_pcm_with_errors);
@@ -3187,19 +3184,6 @@
Opts.addRemappedFile(Split.first, Split.second);
}
- if (Arg *A = Args.getLastArg(OPT_fobjc_arc_cxxlib_EQ)) {
- StringRef Name = A->getValue();
- unsigned Library = llvm::StringSwitch<unsigned>(Name)
- .Case("libc++", ARCXX_libcxx)
- .Case("libstdc++", ARCXX_libstdcxx)
- .Case("none", ARCXX_nolib)
- .Default(~0U);
- if (Library == ~0U)
- Diags.Report(diag::err_drv_invalid_value) << A->getAsString(Args) << Name;
- else
- Opts.ObjCXXARCStandardLibrary = (ObjCXXARCStandardLibraryKind)Library;
- }
-
// Always avoid lexing editor placeholders when we're just running the
// preprocessor as we never want to emit the
// "editor placeholder in source file" error in PP only mode.
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2615,7 +2615,8 @@
def include_ : JoinedOrSeparate<["-", "--"], "include">, Group<clang_i_Group>, EnumName<"include">,
MetaVarName<"<file>">, HelpText<"Include file before parsing">, Flags<[CC1Option]>;
def include_pch : Separate<["-"], "include-pch">, Group<clang_i_Group>, Flags<[CC1Option]>,
- HelpText<"Include precompiled header file">, MetaVarName<"<file>">;
+ HelpText<"Include precompiled header file">, MetaVarName<"<file>">,
+ MarshallingInfoString<"PreprocessorOpts->ImplicitPCHInclude">;
def relocatable_pch : Flag<["-", "--"], "relocatable-pch">, Flags<[CC1Option]>,
HelpText<"Whether to build a relocatable precompiled header">,
MarshallingInfoFlag<"FrontendOpts.RelocatablePCH">;
@@ -4857,7 +4858,8 @@
HelpText<"Override record layouts with those in the given file">;
def pch_through_header_EQ : Joined<["-"], "pch-through-header=">,
HelpText<"Stop PCH generation after including this file. When using a PCH, "
- "skip tokens until after this file is included.">;
+ "skip tokens until after this file is included.">,
+ MarshallingInfoString<"PreprocessorOpts->PCHThroughHeader">;
def pch_through_hdrstop_create : Flag<["-"], "pch-through-hdrstop-create">,
HelpText<"When creating a PCH, stop PCH generation after #pragma hdrstop.">,
MarshallingInfoFlag<"PreprocessorOpts->PCHWithHdrStopCreate">;
@@ -4904,7 +4906,9 @@
HelpText<"Specify the class to use for constant Objective-C string objects.">,
MarshallingInfoString<"LangOpts->ObjCConstantStringClass">;
def fobjc_arc_cxxlib_EQ : Joined<["-"], "fobjc-arc-cxxlib=">,
- HelpText<"Objective-C++ Automatic Reference Counting standard library kind">, Values<"libc++,libstdc++,none">;
+ HelpText<"Objective-C++ Automatic Reference Counting standard library kind">, Values<"libc++,libstdc++,none">,
+ NormalizedValues<["ARCXX_libcxx", "ARCXX_libstdcxx", "ARCXX_nolib"]>,
+ MarshallingInfoString<"PreprocessorOpts->ObjCXXARCStandardLibrary", "ARCXX_nolib">, AutoNormalizeEnum;
def fobjc_runtime_has_weak : Flag<["-"], "fobjc-runtime-has-weak">,
HelpText<"The target Objective-C runtime supports ARC weak operations">;
def fobjc_dispatch_method_EQ : Joined<["-"], "fobjc-dispatch-method=">,
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
