summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/xray/xray_buffer_queue.cc6
-rw-r--r--compiler-rt/lib/xray/xray_buffer_queue.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler-rt/lib/xray/xray_buffer_queue.cc b/compiler-rt/lib/xray/xray_buffer_queue.cc
index c42bba32273..d6ba7a71c54 100644
--- 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 1634a21e6af..7bad02699e0 100644
--- 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.
OpenPOWER on IntegriCloud