From 644c16c76cc11034b124763a039a7164cb3e1abc Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Tue, 6 Sep 2016 08:48:14 -0400 Subject: [PATCH] cmd/compile: fix intrinsifying sync/atomic.Swap* on AMD64 It should alias to Xchg instead of Swap. Found when testing #16985. Change-Id: If9fd734a1f89b8b2656f421eb31b9d1b0d95a49f Reviewed-on: https://go-review.googlesource.com/28512 Run-TryBot: Cherry Zhang TryBot-Result: Gobot Gobot Reviewed-by: Keith Randall --- src/cmd/compile/internal/gc/ssa.go | 12 ++++++------ test/intrinsic.dir/atomic.go | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 test/intrinsic.dir/atomic.go diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go index 83c048f1df..548fd83847 100644 --- a/src/cmd/compile/internal/gc/ssa.go +++ b/src/cmd/compile/internal/gc/ssa.go @@ -2706,17 +2706,17 @@ func intrinsicInit() { i.std[intrinsicKey{"runtime/internal/atomic", "Store64"}] i.std[intrinsicKey{"sync/atomic", "SwapInt32"}] = - i.std[intrinsicKey{"runtime/internal/atomic", "Swap"}] + i.std[intrinsicKey{"runtime/internal/atomic", "Xchg"}] i.std[intrinsicKey{"sync/atomic", "SwapInt64"}] = - i.std[intrinsicKey{"runtime/internal/atomic", "Swap64"}] + i.std[intrinsicKey{"runtime/internal/atomic", "Xchg64"}] i.std[intrinsicKey{"sync/atomic", "SwapUint32"}] = - i.std[intrinsicKey{"runtime/internal/atomic", "Swap"}] + i.std[intrinsicKey{"runtime/internal/atomic", "Xchg"}] i.std[intrinsicKey{"sync/atomic", "SwapUint64"}] = - i.std[intrinsicKey{"runtime/internal/atomic", "Swap64"}] + i.std[intrinsicKey{"runtime/internal/atomic", "Xchg64"}] i.ptrSized[sizedIntrinsicKey{"sync/atomic", "SwapUintptr", 4}] = - i.std[intrinsicKey{"runtime/internal/atomic", "Swap"}] + i.std[intrinsicKey{"runtime/internal/atomic", "Xchg"}] i.ptrSized[sizedIntrinsicKey{"sync/atomic", "SwapUintptr", 8}] = - i.std[intrinsicKey{"runtime/internal/atomic", "Swap64"}] + i.std[intrinsicKey{"runtime/internal/atomic", "Xchg64"}] i.std[intrinsicKey{"sync/atomic", "CompareAndSwapInt32"}] = i.std[intrinsicKey{"runtime/internal/atomic", "Cas"}] diff --git a/test/intrinsic.dir/atomic.go b/test/intrinsic.dir/atomic.go new file mode 100644 index 0000000000..71468a1b38 --- /dev/null +++ b/test/intrinsic.dir/atomic.go @@ -0,0 +1,19 @@ +// +build amd64 + +// Copyright 2016 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package main + +import "sync/atomic" + +var x uint32 + +func atomics() { + _ = atomic.LoadUint32(&x) // ERROR "intrinsic substitution for LoadUint32" + atomic.StoreUint32(&x, 1) // ERROR "intrinsic substitution for StoreUint32" + atomic.AddUint32(&x, 1) // ERROR "intrinsic substitution for AddUint32" + atomic.SwapUint32(&x, 1) // ERROR "intrinsic substitution for SwapUint32" + atomic.CompareAndSwapUint32(&x, 1, 2) // ERROR "intrinsic substitution for CompareAndSwapUint32" +} -- 2.48.1