commit 092a4046ff7bd3d7e24bc77cecf3d1bb0aa52107
author Alex Light <allight@google.com> Wed Jul 12 08:46:44 2017 -0700
committer Alex Light <allight@google.com> Fri Jul 14 14:52:23 2017 -0700
tree 966086d6f9b69f1a677110f2d3cd3b9f0491bc3d
parent 5e7eb2faccf8f4a28e9fcda26053a5b388f2190a

Ensure jvmti agents don't share ThreadLocalStorage

Bug: 63665647
Test: ./test.py --host -j40

Change-Id: Iea33cca5b708f60390b8c79462ca991363ad33a2

runtime/thread.h

diff --git a/runtime/thread.h b/runtime/thread.h
index ad35ef2..e1102ed 100644
--- a/runtime/thread.h
+++ b/runtime/thread.h
@@ -1182,11 +1182,11 @@
     return debug_disallow_read_barrier_;
   }
 
-  const void* GetCustomTLS() const {
+  void* GetCustomTLS() const REQUIRES(Locks::thread_list_lock_) {
     return custom_tls_;
   }
 
-  void SetCustomTLS(const void* data) {
+  void SetCustomTLS(void* data) REQUIRES(Locks::thread_list_lock_) {
     custom_tls_ = data;
   }
 
@@ -1683,7 +1683,7 @@
 
   // Custom TLS field that can be used by plugins.
   // TODO: Generalize once we have more plugins.
-  const void* custom_tls_;
+  void* custom_tls_;
 
   // True if the thread is allowed to call back into java (for e.g. during class resolution).
   // By default this is true.