[compiler-rt] r316410 - [XRay][compiler-rt] More fixups.

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Mon Oct 23 19:43:49 2017
New Revision: 316410

URL: http://llvm.org/viewvc/llvm-project?rev=316410&view=rev
Log:
[XRay][compiler-rt] More fixups.

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=316410&r1=316409&r2=316410&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:43:49 2017
@@ -36,7 +36,7 @@ BufferQueue::BufferQueue(size_t B, size_
       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::getB
   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;

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=316410&r1=316409&r2=316410&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:43:49 2017
@@ -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);
     }
   }