replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Emit proper CodeView when -gcodeview is passed without the cl driver. 

Windows debuggers don't work properly when column info is emitted
with lines.  We handled this by checking if the driver mode was
cl, but it's possible to cause the gcc driver to emit codeview as
well, and in that path we were emitting column info with codeview.

Differential Revision: https://reviews.llvm.org/D43700

llvm-svn: 326113
This commit is contained in:
Zachary Turner 2018-02-26 19:25:39 +00:00
parent 7c94582f90
commit 9eee7bb7e5
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Driver/ToolChains/Clang.cpp
View File

@ -2968,7 +2968,7 @@ static void RenderDebugOptions(const ToolChain &TC, const Driver &D,
// Forward -gcodeview. EmitCodeView might have been set by CL-compatibility // Forward -gcodeview. EmitCodeView might have been set by CL-compatibility
// argument parsing. // argument parsing.
if (Args.hasArg(options::OPT_gcodeview) || EmitCodeView) { if (EmitCodeView) {
// DWARFVersion remains at 0 if no explicit choice was made. // DWARFVersion remains at 0 if no explicit choice was made.
CmdArgs.push_back("-gcodeview"); CmdArgs.push_back("-gcodeview");
} else if (DWARFVersion == 0 && } else if (DWARFVersion == 0 &&
@ -3567,6 +3567,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
types::ID InputType = Input.getType(); types::ID InputType = Input.getType();
if (D.IsCLMode()) if (D.IsCLMode())
AddClangCLArgs(Args, InputType, CmdArgs, &DebugInfoKind, &EmitCodeView); AddClangCLArgs(Args, InputType, CmdArgs, &DebugInfoKind, &EmitCodeView);
else
EmitCodeView = Args.hasArg(options::OPT_gcodeview);
const Arg *SplitDWARFArg = nullptr; const Arg *SplitDWARFArg = nullptr;
RenderDebugOptions(getToolChain(), D, RawTriple, Args, EmitCodeView, RenderDebugOptions(getToolChain(), D, RawTriple, Args, EmitCodeView,

13
clang/test/Driver/codeview-column-info.c Normal file
View File

@ -0,0 +1,13 @@
// Check that -dwarf-column-info does not get added to the cc1 line:
// 1) When -gcodeview is present via the clang or clang++ driver
// 2) When /Z7 is present via the cl driver.
// RUN: %clang -### -c -g -gcodeview %s 2> %t1
// RUN: FileCheck < %t1 %s
// RUN: %clangxx -### -c -g -gcodeview %s 2> %t2
// RUN: FileCheck < %t2 %s
// RUN: %clang_cl -### /c /Z7 %s 2> %t2
// RUN: FileCheck < %t2 %s
// CHECK: "-cc1"
// CHECK-NOT: "-dwarf-column-info"