diff options
| -rw-r--r-- | lib/Driver/Tools.cpp | 21 | ||||
| -rw-r--r-- | test/Driver/debug-options.c | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index bacfab58b0..bd3d638afd 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2567,12 +2567,21 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA, // Ignore explicit -force_cpusubtype_ALL option. (void) Args.hasArg(options::OPT_force__cpusubtype__ALL); - // Same as Clang::ConstructJob() we special case debug options to only pass - // -g to clang. I guess if it is wrong there then it is wrong here too :) . - Args.ClaimAllArgs(options::OPT_g_Group); - if (Arg *A = Args.getLastArg(options::OPT_g_Group)) - if (!A->getOption().matches(options::OPT_g0)) - CmdArgs.push_back("-g"); + // Determine the original source input. + const Action *SourceAction = &JA; + while (SourceAction->getKind() != Action::InputClass) { + assert(!SourceAction->getInputs().empty() && "unexpected root action!"); + SourceAction = SourceAction->getInputs()[0]; + } + + // Forward -g, assuming we are dealing with an actual assembly file. + if (SourceAction->getType() == types::TY_Asm || + SourceAction->getType() == types::TY_PP_Asm) { + Args.ClaimAllArgs(options::OPT_g_Group); + if (Arg *A = Args.getLastArg(options::OPT_g_Group)) + if (!A->getOption().matches(options::OPT_g0)) + CmdArgs.push_back("-g"); + } // Optionally embed the -cc1as level arguments into the debug info, for build // analysis. diff --git a/test/Driver/debug-options.c b/test/Driver/debug-options.c index 867251971d..afc3ff42cb 100644 --- a/test/Driver/debug-options.c +++ b/test/Driver/debug-options.c @@ -5,6 +5,7 @@ // RUN: %clang -### -c -g3 %s 2>&1 | FileCheck -check-prefix=G3 %s // RUN: %clang -### -c -ganything %s 2>&1 | FileCheck -check-prefix=GANY %s // RUN: %clang -### -c -gfoo %s 2>&1 | FileCheck -check-prefix=GFOO %s +// RUN: %clang -### -c -save-temps -g %s 2>&1 | FileCheck -check-prefix=SAVE %s // // G: "-cc1" // G: "-g" @@ -17,3 +18,6 @@ // // GFOO: "-cc1" // GFOO-NOT: "-g" +// +// SAVE: "-cc1as" +// SAVE-NOT: "-g" |