143 return result; |
143 return result; |
144 } |
144 } |
145 |
145 |
146 template <DecoratorSet decorators, typename BarrierSetT> |
146 template <DecoratorSet decorators, typename BarrierSetT> |
147 template <typename T> |
147 template <typename T> |
148 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_not_in_heap(oop new_value, T* addr) { |
148 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_not_in_heap(T* addr, oop new_value) { |
149 oop previous = Raw::oop_atomic_xchg(new_value, addr); |
149 oop previous = Raw::oop_atomic_xchg(addr, new_value); |
150 if (previous != NULL) { |
150 if (previous != NULL) { |
151 return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_not_null(previous); |
151 return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_not_null(previous); |
152 } else { |
152 } else { |
153 return previous; |
153 return previous; |
154 } |
154 } |
155 } |
155 } |
156 |
156 |
157 template <DecoratorSet decorators, typename BarrierSetT> |
157 template <DecoratorSet decorators, typename BarrierSetT> |
158 template <typename T> |
158 template <typename T> |
159 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_impl(oop new_value, T* addr) { |
159 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_impl(T* addr, oop new_value) { |
160 ShenandoahBarrierSet::barrier_set()->storeval_barrier(new_value); |
160 ShenandoahBarrierSet::barrier_set()->storeval_barrier(new_value); |
161 oop result = oop_atomic_xchg_not_in_heap(new_value, addr); |
161 oop result = oop_atomic_xchg_not_in_heap(addr, new_value); |
162 const bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0; |
162 const bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0; |
163 if (keep_alive && ShenandoahSATBBarrier && !CompressedOops::is_null(result) && |
163 if (keep_alive && ShenandoahSATBBarrier && !CompressedOops::is_null(result) && |
164 ShenandoahHeap::heap()->is_concurrent_mark_in_progress()) { |
164 ShenandoahHeap::heap()->is_concurrent_mark_in_progress()) { |
165 ShenandoahBarrierSet::barrier_set()->enqueue(result); |
165 ShenandoahBarrierSet::barrier_set()->enqueue(result); |
166 } |
166 } |
167 return result; |
167 return result; |
168 } |
168 } |
169 |
169 |
170 template <DecoratorSet decorators, typename BarrierSetT> |
170 template <DecoratorSet decorators, typename BarrierSetT> |
171 template <typename T> |
171 template <typename T> |
172 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap(oop new_value, T* addr) { |
172 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap(T* addr, oop new_value) { |
173 oop result = oop_atomic_xchg_in_heap_impl(new_value, addr); |
173 oop result = oop_atomic_xchg_in_heap_impl(addr, new_value); |
174 keep_alive_if_weak(addr, result); |
174 keep_alive_if_weak(addr, result); |
175 return result; |
175 return result; |
176 } |
176 } |
177 |
177 |
178 template <DecoratorSet decorators, typename BarrierSetT> |
178 template <DecoratorSet decorators, typename BarrierSetT> |
179 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset) { |
179 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value) { |
180 oop result = oop_atomic_xchg_in_heap_impl(new_value, AccessInternal::oop_field_addr<decorators>(base, offset)); |
180 oop result = oop_atomic_xchg_in_heap_impl(AccessInternal::oop_field_addr<decorators>(base, offset), new_value); |
181 keep_alive_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), result); |
181 keep_alive_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), result); |
182 return result; |
182 return result; |
183 } |
183 } |
184 |
184 |
185 // Clone barrier support |
185 // Clone barrier support |