[XRay][compiler-rt] More fixups.

Follow-up to D39175.

llvm-svn: 316410

diff --git a/compiler-rt/lib/xray/xray_buffer_queue.cc b/compiler-rt/lib/xray/xray_buffer_queue.cc
index d6ba7a7..34bf3cf 100644 (file)
--- a/compiler-rt/lib/xray/xray_buffer_queue.cc
+++ b/compiler-rt/lib/xray/xray_buffer_queue.cc
@@ -36,7 +36,7 @@ BufferQueue::BufferQueue(size_t B, size_t N, bool &Success)
       Success = false;
       return;
     }
-    auto &Buf = T.Buffer;
+    auto &Buf = T.Buff;
     Buf.Buffer = Tmp;
     Buf.Size = B;
     OwnedBuffers[i] = Tmp;
@@ -51,7 +51,7 @@ BufferQueue::ErrorCode BufferQueue::getBuffer(Buffer &Buf) {
   if (LiveBuffers == BufferCount) return ErrorCode::NotEnoughMemory;
 
   auto &T = *Next;
-  auto &B = T.Buffer;
+  auto &B = T.Buff;
   Buf = B;
   ++LiveBuffers;
 
@@ -99,7 +99,7 @@ BufferQueue::~BufferQueue() {
   for (auto I = Buffers, E = Buffers + BufferCount; I != E; ++I) {
     auto &T = *I;
     auto &Buf = T.Buff;
-    InternalFree(Buf.Buff);
+    InternalFree(Buf.Buffer);
   }
   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 7bad026..9257657 100644 (file)
--- a/compiler-rt/lib/xray/xray_buffer_queue.h
+++ b/compiler-rt/lib/xray/xray_buffer_queue.h
@@ -141,7 +141,7 @@ class BufferQueue {
     __sanitizer::SpinMutexLock G(&Mutex);
     for (auto I = Buffers, E = Buffers + BufferCount; I != E; ++I) {
       const auto &T = *I;
-      if (T.Used) Fn(T.Buffer);
+      if (T.Used) Fn(T.Buff);
     }
   }