aboutsummaryrefslogtreecommitdiff
path: root/lib/Frontend/CompilerInvocation.cpp
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2012-03-06 18:49:20 +0000
committerChad Rosier <mcrosier@apple.com>2012-03-06 18:49:20 +0000
commit250008b4678b19ef80866702e300bb4e53d9ff2d (patch)
treef632bc87d78f1d3b89f90cb8851d4f44154af953 /lib/Frontend/CompilerInvocation.cpp
parent27949f65b089fec7902b2a15d718b3d1b0ccf988 (diff)
[driver] Add support for -fno-inline.
rdar://10972766 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152130 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/CompilerInvocation.cpp')
-rw-r--r--lib/Frontend/CompilerInvocation.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 14cdefb9af..43ac475211 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -1096,6 +1096,9 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
// We must always run at least the always inlining pass.
Opts.Inlining = (Opts.OptimizationLevel > 1) ? CodeGenOptions::NormalInlining
: CodeGenOptions::OnlyAlwaysInlining;
+ // -fno-inline overrides OptimizationLevel > 1.
+ Opts.Inlining = Args.hasArg(OPT_fno_inline) ?
+ CodeGenOptions::OnlyAlwaysInlining : Opts.Inlining;
Opts.DebugInfo = Args.hasArg(OPT_g);
Opts.LimitDebugInfo = !Args.hasArg(OPT_fno_limit_debug_info)
@@ -1915,8 +1918,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
// optimization level and -fno-inline, not actually whether the backend has
// inlining enabled.
//
- // FIXME: This is affected by other options (-fno-inline).
- Opts.NoInline = !Opt;
+ Opts.NoInline = !Opt || Args.hasArg(OPT_fno_inline);
Opts.FastMath = Args.hasArg(OPT_ffast_math);