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).

llvm-svn: 326006

2 files changed, 2 insertions, 3 deletions

diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
index 3917df4e6e8..b0de1ffa808 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
@@ -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;
diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index b110480a2c8..1795172ae5a 100644
--- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -337,10 +337,10 @@ bool collectStatsForObjectFile(ObjectFile &Obj, DWARFContext &DICtx,
                                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;
 }