--- a/src/hotspot/share/oops/access.inline.hpp Mon Nov 25 12:32:40 2019 +0100
+++ b/src/hotspot/share/oops/access.inline.hpp Mon Nov 25 12:33:15 2019 +0100
@@ -107,16 +107,16 @@
template <class GCBarrierType, DecoratorSet decorators>
struct PostRuntimeDispatch<GCBarrierType, BARRIER_ATOMIC_CMPXCHG, decorators>: public AllStatic {
template <typename T>
- static T access_barrier(T new_value, void* addr, T compare_value) {
- return GCBarrierType::atomic_cmpxchg_in_heap(new_value, reinterpret_cast<T*>(addr), compare_value);
+ static T access_barrier(void* addr, T compare_value, T new_value) {
+ return GCBarrierType::atomic_cmpxchg_in_heap(reinterpret_cast<T*>(addr), compare_value, new_value);
}
- static oop oop_access_barrier(oop new_value, void* addr, oop compare_value) {
+ static oop oop_access_barrier(void* addr, oop compare_value, oop new_value) {
typedef typename HeapOopType<decorators>::type OopType;
if (HasDecorator<decorators, IN_HEAP>::value) {
- return GCBarrierType::oop_atomic_cmpxchg_in_heap(new_value, reinterpret_cast<OopType*>(addr), compare_value);
+ return GCBarrierType::oop_atomic_cmpxchg_in_heap(reinterpret_cast<OopType*>(addr), compare_value, new_value);
} else {
- return GCBarrierType::oop_atomic_cmpxchg_not_in_heap(new_value, reinterpret_cast<OopType*>(addr), compare_value);
+ return GCBarrierType::oop_atomic_cmpxchg_not_in_heap(reinterpret_cast<OopType*>(addr), compare_value, new_value);
}
}
};
@@ -183,12 +183,12 @@
template <class GCBarrierType, DecoratorSet decorators>
struct PostRuntimeDispatch<GCBarrierType, BARRIER_ATOMIC_CMPXCHG_AT, decorators>: public AllStatic {
template <typename T>
- static T access_barrier(T new_value, oop base, ptrdiff_t offset, T compare_value) {
- return GCBarrierType::atomic_cmpxchg_in_heap_at(new_value, base, offset, compare_value);
+ static T access_barrier(oop base, ptrdiff_t offset, T compare_value, T new_value) {
+ return GCBarrierType::atomic_cmpxchg_in_heap_at(base, offset, compare_value, new_value);
}
- static oop oop_access_barrier(oop new_value, oop base, ptrdiff_t offset, oop compare_value) {
- return GCBarrierType::oop_atomic_cmpxchg_in_heap_at(new_value, base, offset, compare_value);
+ static oop oop_access_barrier(oop base, ptrdiff_t offset, oop compare_value, oop new_value) {
+ return GCBarrierType::oop_atomic_cmpxchg_in_heap_at(base, offset, compare_value, new_value);
}
};
@@ -309,17 +309,17 @@
}
template <DecoratorSet decorators, typename T>
- T RuntimeDispatch<decorators, T, BARRIER_ATOMIC_CMPXCHG>::atomic_cmpxchg_init(T new_value, void* addr, T compare_value) {
+ T RuntimeDispatch<decorators, T, BARRIER_ATOMIC_CMPXCHG>::atomic_cmpxchg_init(void* addr, T compare_value, T new_value) {
func_t function = BarrierResolver<decorators, func_t, BARRIER_ATOMIC_CMPXCHG>::resolve_barrier();
_atomic_cmpxchg_func = function;
- return function(new_value, addr, compare_value);
+ return function(addr, compare_value, new_value);
}
template <DecoratorSet decorators, typename T>
- T RuntimeDispatch<decorators, T, BARRIER_ATOMIC_CMPXCHG_AT>::atomic_cmpxchg_at_init(T new_value, oop base, ptrdiff_t offset, T compare_value) {
+ T RuntimeDispatch<decorators, T, BARRIER_ATOMIC_CMPXCHG_AT>::atomic_cmpxchg_at_init(oop base, ptrdiff_t offset, T compare_value, T new_value) {
func_t function = BarrierResolver<decorators, func_t, BARRIER_ATOMIC_CMPXCHG_AT>::resolve_barrier();
_atomic_cmpxchg_at_func = function;
- return function(new_value, base, offset, compare_value);
+ return function(base, offset, compare_value, new_value);
}
template <DecoratorSet decorators, typename T>