maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Using an invalid -O falls back on -O3 instead of an error" 

This reverts commit r194403.

Was breaking too many tests...

llvm-svn: 194420
This commit is contained in:
Sylvestre Ledru 2013-11-11 20:51:44 +00:00
parent cc645758c7
commit e293b1a8d8
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/include/clang/Basic/DiagnosticDriverKinds.td
View File

@ -113,7 +113,6 @@ def err_drv_unknown_toolchain : Error<
"cannot recognize the type of the toolchain">;
def warn_O4_is_O3 : Warning<"-O4 is equivalent to -O3">, InGroup<Deprecated>;
def warn_drv_invalid_value : Warning<"optimization level '%0' is unsupported; using '%1%2' instead.">;
def warn_c_kext : Warning<
"ignoring -fapple-kext which is valid for C++ and Objective-C++ only">;
def warn_drv_input_file_unused : Warning<

2
clang/lib/Driver/Tools.cpp
View File

@ -2727,7 +2727,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
// preprocessed inputs and configure concludes that -fPIC is not supported.
Args.ClaimAllArgs(options::OPT_D);
// Manually translate -O4 to -O3; let clang fall back on -O3 for others
// Manually translate -O4 to -O3; let clang reject others.
if (Arg *A = Args.getLastArg(options::OPT_O_Group)) {
if (A->getOption().matches(options::OPT_O4)) {
CmdArgs.push_back("-O3");

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

@ -299,14 +299,14 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
using namespace options;
bool Success = true;
Opts.OptimizationLevel = getOptimizationLevel(Args, IK, Diags);
unsigned MaxOptLevel = 3;
if (Opts.OptimizationLevel > MaxOptLevel) {
// If the optimization level is not supported, fall back on the default optimization
Diags.Report(diag::warn_drv_invalid_value)
<< Args.getLastArg(OPT_O)->getAsString(Args) << "-O" << MaxOptLevel;
Opts.OptimizationLevel = MaxOptLevel;
unsigned OptLevel = getOptimizationLevel(Args, IK, Diags);
if (OptLevel > 3) {
Diags.Report(diag::err_drv_invalid_value)
<< Args.getLastArg(OPT_O)->getAsString(Args) << OptLevel;
OptLevel = 3;
Success = false;
}
Opts.OptimizationLevel = OptLevel;
// We must always run at least the always inlining pass.
Opts.setInlining(

3
clang/test/Driver/clang_f_opts.c
View File

@ -100,9 +100,6 @@
// CHECK-MAX-O: warning: -O4 is equivalent to -O3
// CHECK-MAX-O: -O3
// RUN: %clang -### -S -O20 %s 2>&1 | FileCheck -check-prefix=CHECK-INVALID-O %s
// CHECK-INVALID-O: warning: optimization level '-O20' is unsupported; using '-O3' instead.
// Test that we don't error on these.
// RUN: %clang -### -S -Werror \
// RUN: -falign-functions -falign-functions=2 -fno-align-functions \