commit a6809b060e60a54f1ca91f22245b7f3ba2126a95
author Hans Boehm <hboehm@google.com> Fri Aug 17 17:14:47 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 17 17:14:47 2018 -0700
tree 93ee06f5ceace87115a7c8aab5b886cf5989ba3e
parent bb1ebf577459ae89bf510910c602601e33d39f0b
parent 39ca279282505776620f3e022048857fbc57b7da

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

Change-Id: Ib0e36940d360fbd3e883af3ac2f4c682ad73b684

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