From 27087022cea3b9fec19c9fae206abd57bf880bd3 Mon Sep 17 00:00:00 2001 From: Dmitriy Vyukov Date: Thu, 15 Nov 2012 21:30:24 +0400 Subject: [PATCH] sync/atomic: fix race instrumentation R=golang-dev, iant CC=golang-dev https://golang.org/cl/6782075 --- src/pkg/sync/atomic/race.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pkg/sync/atomic/race.go b/src/pkg/sync/atomic/race.go index 049440205d..242bbf298f 100644 --- a/src/pkg/sync/atomic/race.go +++ b/src/pkg/sync/atomic/race.go @@ -165,7 +165,7 @@ func LoadPointer(addr *unsafe.Pointer) (val unsafe.Pointer) { func LoadUintptr(addr *uintptr) (val uintptr) { runtime.RaceSemacquire(&mtx) - runtime.RaceRead(unsafe.Pointer(val)) + runtime.RaceRead(unsafe.Pointer(addr)) runtime.RaceAcquire(unsafe.Pointer(addr)) val = *addr runtime.RaceSemrelease(&mtx) @@ -198,7 +198,7 @@ func StoreUint64(addr *uint64, val uint64) { func StorePointer(addr *unsafe.Pointer, val unsafe.Pointer) { runtime.RaceSemacquire(&mtx) - runtime.RaceRead(unsafe.Pointer(val)) + runtime.RaceRead(unsafe.Pointer(addr)) *addr = val runtime.RaceRelease(unsafe.Pointer(addr)) runtime.RaceSemrelease(&mtx) @@ -206,7 +206,7 @@ func StorePointer(addr *unsafe.Pointer, val unsafe.Pointer) { func StoreUintptr(addr *uintptr, val uintptr) { runtime.RaceSemacquire(&mtx) - runtime.RaceRead(unsafe.Pointer(val)) + runtime.RaceRead(unsafe.Pointer(addr)) *addr = val runtime.RaceRelease(unsafe.Pointer(addr)) runtime.RaceSemrelease(&mtx) -- 2.48.1