commit 4b896eb7927b3c5f688b95c4b5be6ecbe0cafc45
author Pavel Labath <labath@google.com> Wed Jun 13 08:29:19 2018 +0000
committer Pavel Labath <labath@google.com> Wed Jun 13 08:29:19 2018 +0000
tree f0f047b62c9c50578dd98ca8fc45fdc22e6e1113
parent 9bffc94cf0741a3308e7b8304f044c604fc3d749

Fix "Optional" is ambiguous error on some bots

llvm-svn: 334580

llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp

diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index d9d3662..d75f339 100644
--- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -330,7 +330,7 @@
   if (!CU)
     return DWARFDie();
 
-  if (Optional<uint64_t> DWOId = CU->getDWOId()) {
+  if (llvm::Optional<uint64_t> DWOId = CU->getDWOId()) {
     // This is a skeleton unit. Look up the DIE in the DWO unit.
     CU = DICtx.getDWOCompileUnitForHash(*DWOId);
     if (!CU)