Commit 2b4716d6 authored by Mikael Holmen's avatar Mikael Holmen
Browse files

[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.
parent 4ef38f9c

llvm/lib/MC/MCDwarf.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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.