From b953a01b2cd04263c878292c609686647be396ad Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Wed, 7 Oct 2020 16:37:53 +0200 Subject: Reapply [ADT] function_ref's constructor is unavailable if the argument is not callable. This reverts commit 281703e67ffaee8e26efef86e0df3e145477f4cb. GCC 5.4 bugs are worked around by avoiding use of variable templates. Differential Revision: https://reviews.llvm.org/D88977 --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp') diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 4d69dd7dcc5d..15ca3a54da2d 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -579,9 +579,7 @@ public: /// \returns true if an error occurred. Error parseBitcodeInto( Module *M, bool ShouldLazyLoadMetadata = false, bool IsImporting = false, - DataLayoutCallbackTy DataLayoutCallback = [](std::string) { - return None; - }); + DataLayoutCallbackTy DataLayoutCallback = [](StringRef) { return None; }); static uint64_t decodeSignRotatedValue(uint64_t V); -- cgit v1.2.3