Skip to content

Commit

Permalink
[release-branch.go1.11] cmd/compile/internal/gc: OMUL should be evalu…
Browse files Browse the repository at this point in the history
…ated 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 #28694

Change-Id: I30b87501782fff62d35151f394a1c22b0d490c6c
Reviewed-on: https://go-review.googlesource.com/c/148837
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
(cherry picked from commit c92e73b)
Reviewed-on: https://go-review.googlesource.com/c/151342
Reviewed-by: Andrew Bonventre <andybons@golang.org>
  • Loading branch information
Milan Knezevic authored and andybons committed Nov 27, 2018
1 parent 62b47c2 commit ba4638d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/cmd/compile/internal/gc/subr.go
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,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
}
Expand Down
31 changes: 31 additions & 0 deletions test/fixedbugs/issue28688.go
Original file line number Diff line number Diff line change
@@ -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")
}
}

0 comments on commit ba4638d

Please sign in to comment.