[driver] What was implemented in r152130 was actually -fno-inline-functions, not

-fno-inline.
Part of rdar://10972766

llvm-svn: 152145

1 files changed, 4 insertions, 3 deletions

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 9391eea32d0..7038e85c4a5 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/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);