Mercurial > hg > truffle
comparison src/os/solaris/vm/thread_solaris.inline.hpp @ 21645:7eb156f30b61
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 01 Jun 2015 22:13:10 +0200 |
parents | ca3c6538bcec |
children |
comparison
equal
deleted
inserted
replaced
21644:2c6802ac343c | 21645:7eb156f30b61 |
---|---|
45 debug_only(if (UseMallocOnly) return get_thread_slow();); | 45 debug_only(if (UseMallocOnly) return get_thread_slow();); |
46 | 46 |
47 uintptr_t raw = pd_raw_thread_id(); | 47 uintptr_t raw = pd_raw_thread_id(); |
48 int ix = pd_cache_index(raw); | 48 int ix = pd_cache_index(raw); |
49 Thread* candidate = ThreadLocalStorage::_get_thread_cache[ix]; | 49 Thread* candidate = ThreadLocalStorage::_get_thread_cache[ix]; |
50 if (candidate->self_raw_id() == raw) { | 50 if (candidate != NULL && candidate->self_raw_id() == raw) { |
51 // hit | 51 // hit |
52 return candidate; | 52 return candidate; |
53 } else { | 53 } else { |
54 return ThreadLocalStorage::get_thread_via_cache_slowly(raw, ix); | 54 return ThreadLocalStorage::get_thread_via_cache_slowly(raw, ix); |
55 } | 55 } |