diff options
author | Dean Michael Berris <dberris@google.com> | 2017-10-24 02:36:32 +0000 |
---|---|---|
committer | Dean Michael Berris <dberris@google.com> | 2017-10-24 02:36:32 +0000 |
commit | 9ec9a9fd8b3abfc1cd978d95c8be40785d40ee17 (patch) | |
tree | 5aab12e2567ae7b018fa024e811097b542a393e4 /lib | |
parent | 6c9ee8c61a70980db9abd1cc481473b11eb206ef (diff) |
[XRay][compiler-rt] Fixup shadowing
Follow-up to D39175.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@316409 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/xray/xray_buffer_queue.cc | 6 | ||||
-rw-r--r-- | lib/xray/xray_buffer_queue.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/xray/xray_buffer_queue.cc b/lib/xray/xray_buffer_queue.cc index c42bba322..d6ba7a71c 100644 --- a/lib/xray/xray_buffer_queue.cc +++ b/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/lib/xray/xray_buffer_queue.h b/lib/xray/xray_buffer_queue.h index 1634a21e6..7bad02699 100644 --- a/lib/xray/xray_buffer_queue.h +++ b/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. |