commit 5b3659803f74a26db5ab465736fed21ef44efd77
author Hans Boehm <hboehm@google.com> Fri Aug 17 17:59:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 17 17:59:16 2018 -0700
tree d3a6650fbda4d75c7bd7cc5632512cbab0037dab
parent fb9068aa14c792130aba2c7adb595246b04d1d66
parent a6809b060e60a54f1ca91f22245b7f3ba2126a95

Merge "Check sp<>::clear() for data races" am: 59cd823752 am: 39ca279282
am: a6809b060e

Change-Id: Ibca4bcbdd438e2f90ba0fdc55a5950f0d046ff94

libutils/include/utils/StrongPointer.h

diff --git a/libutils/include/utils/StrongPointer.h b/libutils/include/utils/StrongPointer.h
index 360fce5..3abce17 100644
--- a/libutils/include/utils/StrongPointer.h
+++ b/libutils/include/utils/StrongPointer.h
@@ -228,8 +228,10 @@
 
 template<typename T>
 void sp<T>::clear() {
-    if (m_ptr) {
-        m_ptr->decStrong(this);
+    T* oldPtr(*const_cast<T* volatile*>(&m_ptr));
+    if (oldPtr) {
+        oldPtr->decStrong(this);
+        if (oldPtr != *const_cast<T* volatile*>(&m_ptr)) sp_report_race();
         m_ptr = nullptr;
     }
 }