[compiler-rt] r316409 - [XRay][compiler-rt] Fixup shadowing

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Mon Oct 23 19:36:32 2017
New Revision: 316409

URL: http://llvm.org/viewvc/llvm-project?rev=316409&view=rev
Log:
[XRay][compiler-rt] Fixup shadowing

Follow-up to D39175.

Modified:
    compiler-rt/trunk/lib/xray/xray_buffer_queue.cc
    compiler-rt/trunk/lib/xray/xray_buffer_queue.h

Modified: compiler-rt/trunk/lib/xray/xray_buffer_queue.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/xray_buffer_queue.cc?rev=316409&r1=316408&r2=316409&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/xray_buffer_queue.cc (original)
+++ compiler-rt/trunk/lib/xray/xray_buffer_queue.cc Mon Oct 23 19:36:32 2017
@@ -78,7 +78,7 @@ BufferQueue::ErrorCode BufferQueue::rele
   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::fina
 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;

Modified: compiler-rt/trunk/lib/xray/xray_buffer_queue.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/xray_buffer_queue.h?rev=316409&r1=316408&r2=316409&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/xray_buffer_queue.h (original)
+++ compiler-rt/trunk/lib/xray/xray_buffer_queue.h Mon Oct 23 19:36:32 2017
@@ -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.