diff options
author | Chad Rosier <mcrosier@apple.com> | 2012-03-06 21:17:19 +0000 |
---|---|---|
committer | Chad Rosier <mcrosier@apple.com> | 2012-03-06 21:17:19 +0000 |
commit | 634a4b1b045b13e7ddfa57934cf2b85d4348f77f (patch) | |
tree | 0e734d1c0bdcc0189524798052ce07286d117493 /lib/Frontend | |
parent | 7ba87f38462dde08e4962936a7612b7869e06c0f (diff) |
[driver] What was implemented in r152130 was actually -fno-inline-functions, not
-fno-inline.
Part of rdar://10972766
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152145 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend')
-rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 9391eea32d..7038e85c4a 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -1104,8 +1104,8 @@ 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) ? + // -fno-inline-functions overrides OptimizationLevel > 1. + Opts.Inlining = Args.hasArg(OPT_fno_inline_functions) ? CodeGenOptions::OnlyAlwaysInlining : Opts.Inlining; Opts.DebugInfo = Args.hasArg(OPT_g); @@ -1939,7 +1939,8 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, // optimization level and -fno-inline, not actually whether the backend has // inlining enabled. // - Opts.NoInline = !Opt || Args.hasArg(OPT_fno_inline); + // FIXME: This is affected by other options (-fno-inline). + Opts.NoInline = !Opt; Opts.FastMath = Args.hasArg(OPT_ffast_math); |