From eb4d7c3fceed6c6e4151489c0572cff36500db78 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 15 Nov 2013 15:39:14 +0000 Subject: [PATCH] Using an invalid -O falls back on -O3 instead of an error Summary: Currently with clang: $ clang -O20 foo.c error: invalid value '20' in '-O20' With the patch: $ clang -O20 foo.c warning: optimization level '-O20' is unsupported; using '-O3' instead. 1 warning generated. This matches the gcc behavior (with a warning added) Pass all tests: Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. Testing Time: 94.14s Expected Passes : 6721 Expected Failures : 20 Unsupported Tests : 17 (which was not the case of http://llvm-reviews.chandlerc.com/D2125) Reviewers: chandlerc, rafael, rengolin, hfinkel Reviewed By: rengolin CC: cfe-commits Differential Revision: http://llvm-reviews.chandlerc.com/D2152 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@194817 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/ReleaseNotes.rst | 3 ++- include/clang/Basic/DiagnosticDriverKinds.td | 2 ++ include/clang/Basic/DiagnosticGroups.td | 1 + lib/Driver/Tools.cpp | 2 +- lib/Frontend/CompilerInvocation.cpp | 14 +++++++------- test/Driver/clang_f_opts.c | 3 +++ test/Driver/invalid-o-level.c | 6 ++++-- 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst index 7d63744bdf..597d48142f 100644 --- a/docs/ReleaseNotes.rst +++ b/docs/ReleaseNotes.rst @@ -77,7 +77,8 @@ New Compiler Flags - Clang no longer special cases -O4 to enable lto. Explicitly pass -flto to enable it. -- Command line "clang -O3 -flto a.c -c" and "clang -emit-llvm a.c -c" +- Clang no longer fails on >= -O5. Uses -O3 instead. +- Command line "clang -O3 -flto a.c -c" and "clang -emit-llvm a.c -c" are no longer equivalent. - Clang now errors on unknown -m flags (``-munknown-to-clang``), unknown -f flags (``-funknown-to-clang``) and unknown diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td index ed49006b21..ee87353bda 100644 --- a/include/clang/Basic/DiagnosticDriverKinds.td +++ b/include/clang/Basic/DiagnosticDriverKinds.td @@ -113,6 +113,8 @@ 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; +def warn_drv_optimization_value : Warning<"optimization level '%0' is unsupported; using '%1%2' instead.">, + InGroup; def warn_c_kext : Warning< "ignoring -fapple-kext which is valid for C++ and Objective-C++ only">; def warn_drv_input_file_unused : Warning< diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index bf527ce503..b02bf92e76 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -344,6 +344,7 @@ def UnusedArgument : DiagGroup<"unused-argument">; def UnusedSanitizeArgument : DiagGroup<"unused-sanitize-argument">; def UnusedCommandLineArgument : DiagGroup<"unused-command-line-argument", [UnusedSanitizeArgument]>; +def InvalidCommandLineArgument : DiagGroup<"invalid-command-line-argument">; def UnusedComparison : DiagGroup<"unused-comparison">; def UnusedExceptionParameter : DiagGroup<"unused-exception-parameter">; def UnneededInternalDecl : DiagGroup<"unneeded-internal-declaration">; diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index ceef90f171..f43694de1c 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2760,7 +2760,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 reject others. + // Manually translate -O4 to -O3; let clang fall back on -O3 for others if (Arg *A = Args.getLastArg(options::OPT_O_Group)) { if (A->getOption().matches(options::OPT_O4)) { CmdArgs.push_back("-O3"); diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 581d56d462..f5079dd2a4 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -299,14 +299,14 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, using namespace options; bool Success = true; - 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 = 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_optimization_value) + << Args.getLastArg(OPT_O)->getAsString(Args) << "-O" << MaxOptLevel; + Opts.OptimizationLevel = MaxOptLevel; } - Opts.OptimizationLevel = OptLevel; // We must always run at least the always inlining pass. Opts.setInlining( diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c index a443bba547..a1c1b50d30 100644 --- a/test/Driver/clang_f_opts.c +++ b/test/Driver/clang_f_opts.c @@ -103,6 +103,9 @@ // 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 \ diff --git a/test/Driver/invalid-o-level.c b/test/Driver/invalid-o-level.c index d5242c7ac0..7d877418e2 100644 --- a/test/Driver/invalid-o-level.c +++ b/test/Driver/invalid-o-level.c @@ -1,4 +1,6 @@ -// RUN: not %clang_cc1 %s -O900 2> %t.log +// RUN: %clang_cc1 %s -O900 2> %t.log // RUN: FileCheck %s -input-file=%t.log -// CHECK: invalid value '900' in '-O900' +// CHECK: warning: optimization level '-O900' is unsupported; using '-O3' instead. + + -- 2.40.0