From 17045975da99ee813485f1e15c83bd17e8490d77 Mon Sep 17 00:00:00 2001
From: Dean Michael Berris <dberris@google.com>
Date: Thu, 30 Aug 2018 09:04:12 +0000
Subject: [PATCH] [XRay] Help gcc disambiguate names

Follow-up to D51210.

llvm-svn: 341042
---
 llvm/lib/XRay/FDRTraceWriter.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/llvm/lib/XRay/FDRTraceWriter.cpp b/llvm/lib/XRay/FDRTraceWriter.cpp
index 0fbfba6..0148c6b 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();
-- 
2.7.4