From: Reid Kleckner <rnk@google.com>
Date: Wed, 12 Jul 2017 19:46:35 +0000 (+0000)
Subject: Fix non-Windows build after PDB native builtin type change
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de79ef835a32134be62803556875a3158ae425ac;p=llvm

Fix non-Windows build after PDB native builtin type change

Some C++14 features slipped in along with an extra member qualification.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307835 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h b/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
index fc5529687f5..4f532c6e382 100644
--- a/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
+++ b/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
@@ -29,7 +29,7 @@ public:
 
   void dump(raw_ostream &OS, int Indent) const override;
 
-  PDB_SymType NativeBuiltinSymbol::getSymTag() const override;
+  PDB_SymType getSymTag() const override;
 
   PDB_BuiltinType getBuiltinType() const override;
   bool isConstType() const override;
diff --git a/lib/DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp b/lib/DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp
index bd57fbdd89c..60416f69e13 100644
--- a/lib/DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp
+++ b/lib/DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp
@@ -23,7 +23,7 @@ NativeBuiltinSymbol::NativeBuiltinSymbol(NativeSession &PDBSession,
 NativeBuiltinSymbol::~NativeBuiltinSymbol() {}
 
 std::unique_ptr<NativeRawSymbol> NativeBuiltinSymbol::clone() const {
-  return std::make_unique<NativeBuiltinSymbol>(Session, SymbolId, Type, Length);
+  return llvm::make_unique<NativeBuiltinSymbol>(Session, SymbolId, Type, Length);
 }
 
 void NativeBuiltinSymbol::dump(raw_ostream &OS, int Indent) const {
diff --git a/lib/DebugInfo/PDB/Native/NativeSession.cpp b/lib/DebugInfo/PDB/Native/NativeSession.cpp
index cb41756d826..76de0d8f9e7 100644
--- a/lib/DebugInfo/PDB/Native/NativeSession.cpp
+++ b/lib/DebugInfo/PDB/Native/NativeSession.cpp
@@ -38,7 +38,7 @@ using namespace llvm::pdb;
 namespace {
 // Maps codeview::SimpleTypeKind of a built-in type to the parameters necessary
 // to instantiate a NativeBuiltinSymbol for that type.
-static const struct {
+static const struct BuiltinTypeEntry {
   codeview::SimpleTypeKind Kind;
   PDB_BuiltinType Type;
   uint32_t Size;
@@ -115,14 +115,16 @@ SymIndexId NativeSession::findSymbolByTypeIndex(codeview::TypeIndex Index) {
     if (Index.getSimpleMode() != codeview::SimpleTypeMode::Direct)
       return 0;
     const auto Kind = Index.getSimpleKind();
-    const auto It = std::find_if(
-        std::begin(BuiltinTypes), std::end(BuiltinTypes),
-        [Kind](const auto &Builtin) { return Builtin.Kind == Kind; });
+    const auto It =
+        std::find_if(std::begin(BuiltinTypes), std::end(BuiltinTypes),
+                     [Kind](const BuiltinTypeEntry &Builtin) {
+                       return Builtin.Kind == Kind;
+                     });
     if (It == std::end(BuiltinTypes))
       return 0;
     SymIndexId Id = SymbolCache.size();
     SymbolCache.emplace_back(
-        std::make_unique<NativeBuiltinSymbol>(*this, Id, It->Type, It->Size));
+        llvm::make_unique<NativeBuiltinSymbol>(*this, Id, It->Type, It->Size));
     TypeIndexToSymbolId[Index] = Id;
     return Id;
   }