caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[clang][cli] Report result of ParseLangArgs"

Browse Source 
This reverts commit bff6d9bb

The change causes failure of Clang's Index/implicit-attrs.m test.
This commit is contained in:
Jan Svoboda
2021-02-08 10:18:15 +01:00
parent 63623982e1
commit 6039f82145
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
clang/include/clang/Basic/Diagnostic.h
View File

@@ -806,7 +806,6 @@ public:
return FatalErrorOccurred || UnrecoverableErrorOccurred;
}
unsigned getNumErrors() const { return NumErrors; }
unsigned getNumWarnings() const { return NumWarnings; }
void setNumWarnings(unsigned NumWarnings) {

2
clang/include/clang/Frontend/CompilerInvocation.h
View File

@@ -249,7 +249,7 @@ private:
DiagnosticsEngine &Diags);
/// Parse command line options that map to LangOptions.
static bool ParseLangArgs(LangOptions &Opts, llvm::opt::ArgList &Args,
static void ParseLangArgs(LangOptions &Opts, llvm::opt::ArgList &Args,
InputKind IK, const llvm::Triple &T,
std::vector<std::string> &Includes,
DiagnosticsEngine &Diags);

10
clang/lib/Frontend/CompilerInvocation.cpp
View File

@@ -2642,12 +2642,10 @@ static void GenerateLangArgs(const LangOptions &Opts,
GenerateArg(Args, OPT_fdeclare_opencl_builtins, SA);
}
bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
void CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
InputKind IK, const llvm::Triple &T,
std::vector<std::string> &Includes,
DiagnosticsEngine &Diags) {
unsigned NumErrorsBefore = Diags.getNumErrors();
// FIXME: Cleanup per-file based stuff.
LangStandard::Kind LangStd = LangStandard::lang_unspecified;
if (const Arg *A = Args.getLastArg(OPT_std_EQ)) {
@@ -3078,8 +3076,6 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
}
}
}
return Success && Diags.getNumErrors() == NumErrorsBefore;
}
static bool isStrictlyPreprocessorAction(frontend::ActionKind Action) {
@@ -3420,8 +3416,8 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res,
} else {
// Other LangOpts are only initialized when the input is not AST or LLVM IR.
// FIXME: Should we really be calling this for an Language::Asm input?
Success &= ParseLangArgs(LangOpts, Args, DashX, T,
Res.getPreprocessorOpts().Includes, Diags);
ParseLangArgs(LangOpts, Args, DashX, T, Res.getPreprocessorOpts().Includes,
Diags);
if (Res.getFrontendOpts().ProgramAction == frontend::RewriteObjC)
LangOpts.ObjCExceptions = 1;
if (T.isOSDarwin() && DashX.isPreprocessed()) {