From: David Blaikie <dblaikie@gmail.com>
Date: Mon, 20 Mar 2017 16:35:33 +0000 (+0000)
Subject: Avoid potential ADL ambiguity between llvm::make_unique and std::make_unique (when... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68c97d3a5f06a8c1b0deff8395902e3497ef5377;p=llvm

Avoid potential ADL ambiguity between llvm::make_unique and std::make_unique (when building as C++14+)

Patch by Moritz Kiefer!

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

diff --git a/include/llvm/IR/PassManagerInternal.h b/include/llvm/IR/PassManagerInternal.h
index 02f21675fa9..387dc4c65c4 100644
--- a/include/llvm/IR/PassManagerInternal.h
+++ b/include/llvm/IR/PassManagerInternal.h
@@ -291,7 +291,7 @@ struct AnalysisPassModel : AnalysisPassConcept<IRUnitT, PreservedAnalysesT,
       AnalysisResultConcept<IRUnitT, PreservedAnalysesT, InvalidatorT>>
   run(IRUnitT &IR, AnalysisManager<IRUnitT, ExtraArgTs...> &AM,
       ExtraArgTs... ExtraArgs) override {
-    return make_unique<ResultModelT>(Pass.run(IR, AM, ExtraArgs...));
+    return llvm::make_unique<ResultModelT>(Pass.run(IR, AM, ExtraArgs...));
   }
 
   /// \brief The model delegates to a static \c PassT::name method.