diff options
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Driver/cl-options.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index eb0b78a5800..612fe3b9ae6 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -5890,11 +5890,8 @@ void Clang::AddClangCLArgs(const ArgList &Args, ArgStringList &CmdArgs, // Emit CodeView if -Z7 is present. *EmitCodeView = Args.hasArg(options::OPT__SLASH_Z7); - bool EmitDwarf = Args.hasArg(options::OPT_gdwarf); - // If we are emitting CV but not DWARF, don't build information that LLVM - // can't yet process. - if (*EmitCodeView && !EmitDwarf) - *DebugInfoKind = codegenoptions::DebugLineTablesOnly; + if (*EmitCodeView) + *DebugInfoKind = codegenoptions::LimitedDebugInfo; if (*EmitCodeView) CmdArgs.push_back("-gcodeview"); diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 6054faaf158..5743044a38b 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -379,11 +379,11 @@ // RUN: %clang_cl /Zi /c -### -- %s 2>&1 | FileCheck -check-prefix=Zi %s // Zi: "-gcodeview" -// Zi: "-debug-info-kind=line-tables-only" +// Zi: "-debug-info-kind=limited" // RUN: %clang_cl /Z7 /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7 %s // Z7: "-gcodeview" -// Z7: "-debug-info-kind=line-tables-only" +// Z7: "-debug-info-kind=limited" // RUN: %clang_cl /c -### -- %s 2>&1 | FileCheck -check-prefix=BreproDefault %s // BreproDefault: "-mincremental-linker-compatible" |
