diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Driver/Tools.cpp | 4 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 076311a78e..1420e895a1 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2168,8 +2168,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, false)) CmdArgs.push_back("-fgnu89-inline"); - if (Args.hasArg(options::OPT_fno_inline)) - CmdArgs.push_back("-fno-inline"); + if (Args.hasArg(options::OPT_fno_inline_functions)) + CmdArgs.push_back("-fno-inline-functions"); // -fobjc-nonfragile-abi=0 is default. ObjCRuntime objCRuntime; 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); |