[XRay][compiler-rt] Fixup shadowing

Follow-up to D39175.

llvm-svn: 316409

diff --git a/compiler-rt/lib/xray/xray_buffer_queue.cc b/compiler-rt/lib/xray/xray_buffer_queue.cc
index c42bba32273305c8aac6905b8e87f984682ec4d5..d6ba7a71c5448aa15b53370bb6aad19f57c389a6 100644 (file)
--- a/compiler-rt/lib/xray/xray_buffer_queue.cc
+++ b/compiler-rt/lib/xray/xray_buffer_queue.cc
@@ -78,7 +78,7 @@ BufferQueue::ErrorCode BufferQueue::releaseBuffer(Buffer &Buf) {
   if (LiveBuffers == 0) return ErrorCode::NotEnoughMemory;
 
   // Now that the buffer has been released, we mark it as "used".
-  First->Buffer = Buf;
+  First->Buff = Buf;
   First->Used = true;
   Buf.Buffer = nullptr;
   Buf.Size = 0;
@@ -98,8 +98,8 @@ BufferQueue::ErrorCode BufferQueue::finalize() {
 BufferQueue::~BufferQueue() {
   for (auto I = Buffers, E = Buffers + BufferCount; I != E; ++I) {
     auto &T = *I;
-    auto &Buf = T.Buffer;
-    InternalFree(Buf.Buffer);
+    auto &Buf = T.Buff;
+    InternalFree(Buf.Buff);
   }
   delete[] Buffers;
   delete[] OwnedBuffers;

diff --git a/compiler-rt/lib/xray/xray_buffer_queue.h b/compiler-rt/lib/xray/xray_buffer_queue.h
index 1634a21e6afe3c1a9f89245772c1de2029692c72..7bad02699e01e3f9e682eecba0e1771d6d431456 100644 (file)
--- a/compiler-rt/lib/xray/xray_buffer_queue.h
+++ b/compiler-rt/lib/xray/xray_buffer_queue.h
@@ -36,7 +36,7 @@ class BufferQueue {
  private:
   struct BufferRep {
     // The managed buffer.
-    Buffer Buffer;
+    Buffer Buff;
 
     // This is true if the buffer has been returned to the available queue, and
     // is considered "used" by another thread.