sync/atomic: fix data races in tests

Backport https://codereview.appspot.com/111320044 from Go
master library.

From-SVN: r217110

diff --git a/libgo/go/sync/atomic/atomic_test.go b/libgo/go/sync/atomic/atomic_test.go
index d2af4f4187143b36745b420da5b06fb5fff46b57..eaa3b6b5c987a6e505c50bc17f54dc30d2168a41 100644 (file)
--- a/libgo/go/sync/atomic/atomic_test.go
+++ b/libgo/go/sync/atomic/atomic_test.go
@@ -858,7 +858,7 @@ func hammerCompareAndSwapInt32(uaddr *uint32, count int) {
        addr := (*int32)(unsafe.Pointer(uaddr))
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadInt32(addr)
                        if CompareAndSwapInt32(addr, v, v+1) {
                                break
                        }
@@ -869,7 +869,7 @@ func hammerCompareAndSwapInt32(uaddr *uint32, count int) {
 func hammerCompareAndSwapUint32(addr *uint32, count int) {
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadUint32(addr)
                        if CompareAndSwapUint32(addr, v, v+1) {
                                break
                        }
@@ -883,7 +883,7 @@ func hammerCompareAndSwapUintptr32(uaddr *uint32, count int) {
        addr := (*uintptr)(unsafe.Pointer(uaddr))
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadUintptr(addr)
                        if CompareAndSwapUintptr(addr, v, v+1) {
                                break
                        }
@@ -897,7 +897,7 @@ func hammerCompareAndSwapPointer32(uaddr *uint32, count int) {
        addr := (*unsafe.Pointer)(unsafe.Pointer(uaddr))
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadPointer(addr)
                        if CompareAndSwapPointer(addr, v, unsafe.Pointer(uintptr(v)+1)) {
                                break
                        }
@@ -1039,7 +1039,7 @@ func hammerCompareAndSwapInt64(uaddr *uint64, count int) {
        addr := (*int64)(unsafe.Pointer(uaddr))
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadInt64(addr)
                        if CompareAndSwapInt64(addr, v, v+1) {
                                break
                        }
@@ -1050,7 +1050,7 @@ func hammerCompareAndSwapInt64(uaddr *uint64, count int) {
 func hammerCompareAndSwapUint64(addr *uint64, count int) {
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadUint64(addr)
                        if CompareAndSwapUint64(addr, v, v+1) {
                                break
                        }
@@ -1064,7 +1064,7 @@ func hammerCompareAndSwapUintptr64(uaddr *uint64, count int) {
        addr := (*uintptr)(unsafe.Pointer(uaddr))
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadUintptr(addr)
                        if CompareAndSwapUintptr(addr, v, v+1) {
                                break
                        }
@@ -1078,7 +1078,7 @@ func hammerCompareAndSwapPointer64(uaddr *uint64, count int) {
        addr := (*unsafe.Pointer)(unsafe.Pointer(uaddr))
        for i := 0; i < count; i++ {
                for {
-                       v := *addr
+                       v := LoadPointer(addr)
                        if CompareAndSwapPointer(addr, v, unsafe.Pointer(uintptr(v)+1)) {
                                break
                        }