replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[XRay][compiler-rt] Fixup shadowing 

Follow-up to D39175.

llvm-svn: 316409
This commit is contained in:
Dean Michael Berris 2017-10-24 02:36:32 +00:00
parent d4503da40c
commit 2e592ea7ed
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler-rt/lib/xray/xray_buffer_queue.cc
View File

@ -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;

2
compiler-rt/lib/xray/xray_buffer_queue.h
View File

@ -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.