[PATCH] Avoid ADL for make_unique

David Blaikie via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 20 09:33:38 PDT 2017


LGTM, please commit.

On Wed, Mar 15, 2017 at 11:39 PM Moritz Kiefer via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Without this, a pass with a result type from `std::` causes an error.
> ---
>  include/llvm/IR/PassManagerInternal.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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.
> --
> 2.12.0
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170320/845b77e4/attachment.html>


More information about the llvm-commits mailing list