diff options
author | Sam McCall <sam.mccall@gmail.com> | 2020-10-07 16:37:53 +0200 |
---|---|---|
committer | Sam McCall <sam.mccall@gmail.com> | 2020-10-07 18:31:12 +0200 |
commit | b953a01b2cd04263c878292c609686647be396ad (patch) | |
tree | 42d6cf7784b23727598d6230a46608ce22859166 /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
parent | ff6e4441b93953efb2c52995e79e211a49ffac06 (diff) | |
download | llvm-b953a01b2cd04263c878292c609686647be396ad.zip llvm-b953a01b2cd04263c878292c609686647be396ad.tar.gz llvm-b953a01b2cd04263c878292c609686647be396ad.tar.bz2 |
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
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
-rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 4d69dd7..15ca3a5 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); |