[llvm] r329202 - Fix build breakage from r329201

[Pavel Labath via llvm-commits]

Author: labath
Date: Wed Apr  4 07:54:08 2018
New Revision: 329202

URL: http://llvm.org/viewvc/llvm-project?rev=329202&view=rev
Log:
Fix build breakage from r329201

Some compilers do not like having an enum type and a variable with the
same name (AccelTableKind). I rename the variable to TheAccelTableKind.

Suggestions for a better name welcome.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=329202&r1=329201&r2=329202&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Wed Apr  4 07:54:08 2018
@@ -306,11 +306,11 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Mo
   // supported.
   if (AccelTables == AccelTableKind::Default) {
     if (tuneForLLDB() && A->TM.getTargetTriple().isOSBinFormatMachO())
-      AccelTableKind = AccelTableKind::Apple;
+      TheAccelTableKind = AccelTableKind::Apple;
     else
-      AccelTableKind = AccelTableKind::None;
+      TheAccelTableKind = AccelTableKind::None;
   } else
-    AccelTableKind = AccelTables;
+    TheAccelTableKind = AccelTables;
 
   UseInlineStrings = DwarfInlinedStrings == Enable;
   HasAppleExtensionAttributes = tuneForLLDB();

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=329202&r1=329201&r2=329202&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h Wed Apr  4 07:54:08 2018
@@ -278,7 +278,7 @@ class DwarfDebug : public DebugHandlerBa
 
   /// DWARF5 Experimental Options
   /// @{
-  AccelTableKind AccelTableKind;
+  AccelTableKind TheAccelTableKind;
   bool HasAppleExtensionAttributes;
   bool HasSplitDwarf;
 
@@ -536,7 +536,7 @@ public:
   // Experimental DWARF5 features.
 
   /// Returns what kind (if any) of accelerator tables to emit.
-  llvm::AccelTableKind getAccelTableKind() const { return AccelTableKind; }
+  AccelTableKind getAccelTableKind() const { return TheAccelTableKind; }
 
   bool useAppleExtensionAttributes() const {
     return HasAppleExtensionAttributes;