diff options
| author | Andreas Gampe <agampe@google.com> | 2015-10-26 20:47:28 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-10-28 18:30:14 -0700 |
| commit | 7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5 (patch) | |
| tree | c38a3fc65deb8e28e8913a6c85129a6cb4560f7b /runtime/base/mutex-inl.h | |
| parent | 54d8f4bc810e7e0767f44cb77e5706a232b644bb (diff) | |
| download | art-7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5.zip art-7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5.tar.gz art-7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5.tar.bz2 | |
[WIP] ART: Write-protect TLS
Change-Id: I6762a3a30d01bd6eb8bb25f23f390c91147fe9b4
Diffstat (limited to 'runtime/base/mutex-inl.h')
| -rw-r--r-- | runtime/base/mutex-inl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/base/mutex-inl.h b/runtime/base/mutex-inl.h index 87840e7..2ae3b19 100644 --- a/runtime/base/mutex-inl.h +++ b/runtime/base/mutex-inl.h @@ -74,7 +74,9 @@ static inline void CheckUnattachedThread(LockLevel level) NO_THREAD_SAFETY_ANALY // Ignore logging which may or may not have set up thread data structures. level == kLoggingLock || // Avoid recursive death. - level == kAbortLock) << level; + level == kAbortLock || + // A MemMap may be created for thread objects + level == kMemMapsLock) << level; } } |