[llvm] r326006 - Fix build breakage from r326003

[Pavel Labath via llvm-commits]

Author: labath
Date: Fri Feb 23 16:54:31 2018
New Revision: 326006

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

- an ambiguous reference to Optional<T> in llvm-dwarfdump.cpp (fixed
  with an explicit prefix).
- a missing base class initialization in Entry copy constructor (fixed
  by using the implicitly default constructor, which is possible after
  some changes which were done during review).

Modified:
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
    llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp

Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h?rev=326006&r1=326005&r2=326006&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h Fri Feb 23 16:54:31 2018
@@ -126,7 +126,6 @@ public:
     void extract(const AppleAcceleratorTable &AccelTable, uint32_t *Offset);
 
   public:
-    Entry(const Entry &RHS) : HdrData(RHS.HdrData) { Values = RHS.Values; }
     Optional<uint64_t> getCUOffset() const override;
     Optional<uint64_t> getDIEOffset() const override;
     Optional<dwarf::Tag> getTag() const override;

Modified: llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp?rev=326006&r1=326005&r2=326006&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp (original)
+++ llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp Fri Feb 23 16:54:31 2018
@@ -337,10 +337,10 @@ bool collectStatsForObjectFile(ObjectFil
                                Twine Filename, raw_ostream &OS);
 
 template <typename AccelTable>
-static Optional<uint64_t> getDIEOffset(const AccelTable &Accel,
+static llvm::Optional<uint64_t> getDIEOffset(const AccelTable &Accel,
                                        StringRef Name) {
   for (const auto &Entry : Accel.equal_range(Name))
-    if (Optional<uint64_t> Off = Entry.getDIEOffset())
+    if (llvm::Optional<uint64_t> Off = Entry.getDIEOffset())
       return *Off;
   return None;
 }