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

[Zachary Turner via cfe-commits]

Author: zturner
Date: Mon Feb 26 11:51:29 2018
New Revision: 326116

URL: http://llvm.org/viewvc/llvm-project?rev=326116&view=rev
Log:
Revert "Emit proper CodeView when -gcodeview is passed without the cl driver."

This reverts commit e17911006548518634fad66bb8648bcad49a1d64.

This is failing on ASAN bots because asan expects column info,
and it's also failing on some linux bots for unknown reasons which
i need to investigate.

Removed:
    cfe/trunk/test/Driver/codeview-column-info.c
Modified:
    cfe/trunk/lib/Driver/ToolChains/Clang.cpp

Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=326116&r1=326115&r2=326116&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Mon Feb 26 11:51:29 2018
@@ -2968,7 +2968,7 @@ static void RenderDebugOptions(const Too
 
   // Forward -gcodeview. EmitCodeView might have been set by CL-compatibility
   // argument parsing.
-  if (EmitCodeView) {
+  if (Args.hasArg(options::OPT_gcodeview) || EmitCodeView) {
     // DWARFVersion remains at 0 if no explicit choice was made.
     CmdArgs.push_back("-gcodeview");
   } else if (DWARFVersion == 0 &&
@@ -3567,8 +3567,6 @@ void Clang::ConstructJob(Compilation &C,
   types::ID InputType = Input.getType();
   if (D.IsCLMode())
     AddClangCLArgs(Args, InputType, CmdArgs, &DebugInfoKind, &EmitCodeView);
-  else
-    EmitCodeView = Args.hasArg(options::OPT_gcodeview);
 
   const Arg *SplitDWARFArg = nullptr;
   RenderDebugOptions(getToolChain(), D, RawTriple, Args, EmitCodeView,

Removed: cfe/trunk/test/Driver/codeview-column-info.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/codeview-column-info.c?rev=326115&view=auto
==============================================================================
--- cfe/trunk/test/Driver/codeview-column-info.c (original)
+++ cfe/trunk/test/Driver/codeview-column-info.c (removed)
@@ -1,13 +0,0 @@
-// 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"


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits