From d74e69c7553fcb1e057821a089dc4f2c60f42e5d Mon Sep 17 00:00:00 2001 From: Milan Knezevic Date: Fri, 9 Nov 2018 18:30:46 +0100 Subject: [release-branch.go1.10] cmd/compile/internal/gc: OMUL should be evaluated when using soft-float When using soft-float, OMUL might be rewritten to function call so we should ensure it was evaluated first. Updates #28688 Fixes #28959 Change-Id: I30b87501782fff62d35151f394a1c22b0d490c6c Reviewed-on: https://go-review.googlesource.com/c/148837 Run-TryBot: Cherry Zhang TryBot-Result: Gobot Gobot Reviewed-by: Cherry Zhang (cherry picked from commit c92e73b70253f5d88c473a7ad6c5b8d61b2debb7) Reviewed-on: https://go-review.googlesource.com/c/151343 Reviewed-by: Filippo Valsorda --- src/cmd/compile/internal/gc/subr.go | 2 +- test/fixedbugs/issue28688.go | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 test/fixedbugs/issue28688.go diff --git a/src/cmd/compile/internal/gc/subr.go b/src/cmd/compile/internal/gc/subr.go index e0925dc7f2..eee5a37ad0 100644 --- a/src/cmd/compile/internal/gc/subr.go +++ b/src/cmd/compile/internal/gc/subr.go @@ -1168,7 +1168,7 @@ func calcHasCall(n *Node) bool { // When using soft-float, these ops might be rewritten to function calls // so we ensure they are evaluated first. - case OADD, OSUB, OMINUS: + case OADD, OSUB, OMINUS, OMUL: if thearch.SoftFloat && (isFloat[n.Type.Etype] || isComplex[n.Type.Etype]) { return true } diff --git a/test/fixedbugs/issue28688.go b/test/fixedbugs/issue28688.go new file mode 100644 index 0000000000..0d2000e149 --- /dev/null +++ b/test/fixedbugs/issue28688.go @@ -0,0 +1,31 @@ +// run -gcflags=-d=softfloat + +// Copyright 2018 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 ( + "fmt" +) + +// When using soft-float, OMUL might be rewritten to function +// call so we should ensure it was evaluated first. Stack frame +// setup for "test" function call should happen after call to runtime.fmul32 + +var x int32 = 1 + +func main() { + var y float32 = 1.0 + test(x, y*y) +} + +//go:noinline +func test(id int32, a float32) { + + if id != x { + fmt.Printf("got: %d, want: %d\n", id, x) + panic("FAIL") + } +} -- cgit v1.2.3-54-g00ecf