diff options
| author | Dean Michael Berris <dberris@google.com> | 2018-08-30 09:04:12 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2018-08-30 09:04:12 +0000 |
| commit | 17045975da99ee813485f1e15c83bd17e8490d77 (patch) | |
| tree | f7ea0f02f09f2bb3a29aae73072de661493fd101 | |
| parent | 5c0f66b1feaf995dcd51ac4ef260f1f58a52ea9b (diff) | |
| download | bcm5719-llvm-17045975da99ee813485f1e15c83bd17e8490d77.tar.gz bcm5719-llvm-17045975da99ee813485f1e15c83bd17e8490d77.zip | |
[XRay] Help gcc disambiguate names
Follow-up to D51210.
llvm-svn: 341042
| -rw-r--r-- | llvm/lib/XRay/FDRTraceWriter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/XRay/FDRTraceWriter.cpp b/llvm/lib/XRay/FDRTraceWriter.cpp index 0fbfba613c6..0148c6b7f93 100644 --- a/llvm/lib/XRay/FDRTraceWriter.cpp +++ b/llvm/lib/XRay/FDRTraceWriter.cpp @@ -64,12 +64,13 @@ template <size_t Index> struct IndexedMemcpy { static void Copy(char *, Tuple &&) {} }; -template <uint8_t Kind, class... Data> -Error writeMetadata(raw_ostream &OS, Data&&... Ds) { +template <uint8_t Kind, class... Values> +Error writeMetadata(raw_ostream &OS, Values&&... Ds) { MetadataBlob B; B.Type = 1; B.RecordKind = Kind; - auto T = std::make_tuple(std::forward<Data>(std::move(Ds))...); + std::memset(B.Data, 0, 15); + auto T = std::make_tuple(std::forward<Values>(std::move(Ds))...); IndexedMemcpy<0>::Copy(B.Data, T); OS.write(reinterpret_cast<const char *>(&B), sizeof(MetadataBlob)); return Error::success(); |
