Author: Mikael Holmen Date: 2021-01-21T14:05:14+01:00 New Revision: 2b4716d6dff1c9a5e64b3487a0b2388e3ff18b30
URL: https://github.com/llvm/llvm-project/commit/2b4716d6dff1c9a5e64b3487a0b2388e3ff18b30 DIFF: https://github.com/llvm/llvm-project/commit/2b4716d6dff1c9a5e64b3487a0b2388e3ff18b30.diff LOG: [MC] Use std::make_tuple to make some toolchains happy again My toolchain (LLVM 8.0, libstdc++ 5.4.0) complained with: 12:27:43 ../lib/MC/MCDwarf.cpp:814:10: error: chosen constructor is explicit in copy-initialization 12:27:43 return {Offset, Size, SetDelta}; 12:27:43 ^~~~~~~~~~~~~~~~~~~~~~~~ 12:27:43 /proj/flexasic/app/llvm/8.0/bin/../lib/gcc/x86_64-unknown-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple:479:19: note: explicit constructor declared here 12:27:43 constexpr tuple(_UElements&&... __elements) 12:27:43 ^ 12:27:43 1 error generated. This commit adds explicit calls to std::make_tuple to work around the problem. Added: Modified: llvm/lib/MC/MCDwarf.cpp Removed: ################################################################################ diff --git a/llvm/lib/MC/MCDwarf.cpp b/llvm/lib/MC/MCDwarf.cpp index 410ca296eaf2..f86d4266a1eb 100644 --- a/llvm/lib/MC/MCDwarf.cpp +++ b/llvm/lib/MC/MCDwarf.cpp @@ -811,7 +811,7 @@ MCDwarfLineAddr::fixedEncode(MCContext &Context, int64_t LineDelta, OS << char(dwarf::DW_LNS_copy); } - return {Offset, Size, SetDelta}; + return std::make_tuple(Offset, Size, SetDelta); } // Utility function to write a tuple for .debug_abbrev. _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
