Address review comments, fix test

Author: cjacek

clang/test/CodeGenCXX/debug-info-coff.cpp

@@ -13,7 +13,7 @@
 // CHECK-NEXT:   Magic: 0x4
 // CHECK-NEXT:   Subsection [
 // CHECK-NEXT:     SubSectionType: Symbols (0xF1)
-// CHECK-NEXT:     SubSectionSize: 0x40
+// CHECK-NEXT:     SubSectionSize:
 // CHECK-NEXT:     ObjNameSym {
 // CHECK-NEXT:       Kind: S_OBJNAME (0x1101)
 // CHECK-NEXT:       Signature: 0x0

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -562,10 +562,10 @@ bool AsmPrinter::doInitialization(Module &M) {
   if (MAI->doesSupportDebugInformation()) {
     // On Windows targets, emit minimal CodeView compiler info even when debug
     // info is disabled.
-    if ((TM.getTargetTriple().isOSWindows() || TM.getTargetTriple().isUEFI()) &&
-        M.getNamedMetadata("llvm.dbg.cu"))
+    if (M.getNamedMetadata("llvm.dbg.cu") &&
+        (TM.getTargetTriple().isOSWindows() || TM.getTargetTriple().isUEFI()))
       Handlers.push_back(std::make_unique<CodeViewDebug>(this));
-    if (M.getDwarfVersion() || !M.getCodeViewFlag()) {
+    if (!M.getCodeViewFlag() || M.getDwarfVersion()) {
       if (hasDebugInfo()) {
         DD = new DwarfDebug(this);
         Handlers.push_back(std::unique_ptr<DwarfDebug>(DD));

llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

@@ -611,8 +611,7 @@ static SourceLanguage MapDWLangToCVLang(unsigned DWLang) {
 }
 
 void CodeViewDebug::beginModule(Module *M) {
-  // If module doesn't have named metadata anchors or COFF debug section
-  // is not available, skip any debug info related stuff.
+  // If COFF debug section is not available, skip any debug info related stuff.
   if (!Asm->getObjFileLowering().getCOFFDebugSymbolsSection()) {
     Asm = nullptr;
     return;
@@ -633,9 +632,9 @@ void CodeViewDebug::beginModule(Module *M) {
   const auto *CU = cast<DICompileUnit>(Node);
 
   CurrentSourceLanguage = MapDWLangToCVLang(CU->getSourceLanguage());
-  NoDebug =
+  OnlyCompilerInfo =
       !M->getCodeViewFlag() || CU->getEmissionKind() == DICompileUnit::NoDebug;
-  if (NoDebug)
+  if (OnlyCompilerInfo)
     return;
 
   collectGlobalVariableInfo();
@@ -663,7 +662,7 @@ void CodeViewDebug::endModule() {
   emitObjName();
   emitCompilerInformation();
   endCVSubsection(CompilerInfo);
-  if (NoDebug)
+  if (OnlyCompilerInfo)
     return;
 
   emitInlineeLinesSubsection();
@@ -1453,7 +1452,7 @@ void CodeViewDebug::collectVariableInfo(const DISubprogram *SP) {
 }
 
 void CodeViewDebug::beginFunctionImpl(const MachineFunction *MF) {
-  if (NoDebug)
+  if (OnlyCompilerInfo)
     return;
 
   const TargetSubtargetInfo &TSI = MF->getSubtarget();
@@ -3047,7 +3046,7 @@ void CodeViewDebug::collectLexicalBlockInfo(
 }
 
 void CodeViewDebug::endFunctionImpl(const MachineFunction *MF) {
-  if (NoDebug)
+  if (OnlyCompilerInfo)
     return;
 
   const Function &GV = MF->getFunction();
@@ -3108,7 +3107,7 @@ static bool isUsableDebugLoc(DebugLoc DL) {
 
 void CodeViewDebug::beginInstruction(const MachineInstr *MI) {
   DebugHandlerBase::beginInstruction(MI);
-  if (NoDebug)
+  if (OnlyCompilerInfo)
     return;
 
   // Ignore DBG_VALUE and DBG_LABEL locations and function prologue.

llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.h

@@ -99,7 +99,7 @@ class LLVM_LIBRARY_VISIBILITY CodeViewDebug : public DebugHandlerBase {
   codeview::CPUType TheCPU;
 
   /// Whether to emit compiler information only.
-  bool NoDebug = false;
+  bool OnlyCompilerInfo = false;
 
   static LocalVarDef createDefRangeMem(uint16_t CVRegister, int Offset);