diff options
| author | David James <davidjames@google.com> | 2019-04-07 04:27:56 +0000 |
|---|---|---|
| committer | David James <davidjames@google.com> | 2019-04-07 04:28:50 +0000 |
| commit | 162305aaceca5f6cbaa03db1aa124f67e313612e (patch) | |
| tree | 5a3490b906bf2ab6bf2fb8b0eb7f8c505b178d5d /libs/hwui/thread | |
| parent | 5ff61f32a78dca0c722c8ac2685874a26190ceed (diff) | |
Revert "Fix lifecycle issue in CommonPool"
This reverts commit 5ff61f32a78dca0c722c8ac2685874a26190ceed.
Reason for revert: causes global presubmit to be very flaky, see b/130081457
Fixes: b/130081457
Change-Id: I93aa5d6686cd6b5bf831766c9e47c291749526a9
Diffstat (limited to 'libs/hwui/thread')
| -rw-r--r-- | libs/hwui/thread/CommonPool.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/hwui/thread/CommonPool.h b/libs/hwui/thread/CommonPool.h index 51628259d2a8..aef2990d6343 100644 --- a/libs/hwui/thread/CommonPool.h +++ b/libs/hwui/thread/CommonPool.h @@ -57,13 +57,11 @@ public: mHead = newHead; } - constexpr T pop() { + constexpr T&& pop() { LOG_ALWAYS_FATAL_IF(mTail == mHead, "empty"); int index = mTail; mTail = (mTail + 1) % SIZE; - T ret = std::move(mBuffer[index]); - mBuffer[index] = nullptr; - return ret; + return std::move(mBuffer[index]); } private: |