From ce2122425ae564bcb50a8a02329c044d1292e0d5 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Wed, 10 Feb 2016 21:28:38 +0000
Subject: [PATCH] [clang-cl] /Z7 now generates normal debug info, not just line
info
Previously LLVM could not process any debug info we produced, so it
didn't make sense to spend time generating it. Now that it has primitive
support for local variable info, it does make sense to generate normal
debug info.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@260435 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Driver/Tools.cpp | 7 ++-----
test/Driver/cl-options.c | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index eb0b78a5800..612fe3b9ae6 100644
--- a/lib/Driver/Tools.cpp
+++ b/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/test/Driver/cl-options.c b/test/Driver/cl-options.c
index 6054faaf158..5743044a38b 100644
--- a/test/Driver/cl-options.c
+++ b/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"
--
GitLab