diff options
| author | Pavel Labath <labath@google.com> | 2018-04-04 14:54:08 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2018-04-04 14:54:08 +0000 |
| commit | 0cc0306a758be76af2072a75a148e1975591a742 (patch) | |
| tree | 95c0fd1e06b0556220412beca5c452ac6f2dce6e /llvm/lib/CodeGen | |
| parent | 6088c23431239ff7653ec0acc74e97f4d2771834 (diff) | |
| download | bcm5719-llvm-0cc0306a758be76af2072a75a148e1975591a742.tar.gz bcm5719-llvm-0cc0306a758be76af2072a75a148e1975591a742.zip | |
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.
llvm-svn: 329202
Diffstat (limited to 'llvm/lib/CodeGen')
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 76a360d2ca2..e4adaa14417 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -306,11 +306,11 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M) // 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(); diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h index b1703e9a46a..bd248fd1951 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h @@ -278,7 +278,7 @@ class DwarfDebug : public DebugHandlerBase { /// 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; |

