diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 19:19:13 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 19:19:13 +0000 |
commit | ccd992355df7192993c666236047820244914598 (patch) | |
tree | f00fea65147227b7743083c6148396f74cd66935 /test/fixedbugs/issue30908.dir | |
parent | Initial commit. (diff) | |
download | golang-1.21-ccd992355df7192993c666236047820244914598.tar.xz golang-1.21-ccd992355df7192993c666236047820244914598.zip |
Adding upstream version 1.21.8.upstream/1.21.8
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | test/fixedbugs/issue30908.dir/a.go | 32 | ||||
-rw-r--r-- | test/fixedbugs/issue30908.dir/b.go | 35 | ||||
-rw-r--r-- | test/fixedbugs/issue30908.dir/m.go | 21 |
3 files changed, 88 insertions, 0 deletions
diff --git a/test/fixedbugs/issue30908.dir/a.go b/test/fixedbugs/issue30908.dir/a.go new file mode 100644 index 0000000..2f0abc3 --- /dev/null +++ b/test/fixedbugs/issue30908.dir/a.go @@ -0,0 +1,32 @@ +// Copyright 2019 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 a + +import ( + "errors" + "strings" +) + +var G interface{} + +func Unmarshal(data []byte, o interface{}) error { + G = o + v, ok := o.(*map[string]interface{}) + if !ok { + return errors.New("eek") + } + vals := make(map[string]interface{}) + s := string(data) + items := strings.Split(s, " ") + var err error + for _, item := range items { + vals[item] = s + if item == "error" { + err = errors.New("ouch") + } + } + *v = vals + return err +} diff --git a/test/fixedbugs/issue30908.dir/b.go b/test/fixedbugs/issue30908.dir/b.go new file mode 100644 index 0000000..2f54398 --- /dev/null +++ b/test/fixedbugs/issue30908.dir/b.go @@ -0,0 +1,35 @@ +// Copyright 2019 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 b + +import ( + "io/ioutil" + + "./a" +) + +var G int + +// An inlinable function. To trigger the bug in question this needs +// to be inlined here within the package and also inlined into some +// other package that imports it. +func ReadValues(data []byte) (vals map[string]interface{}, err error) { + err = a.Unmarshal(data, &vals) + if len(vals) == 0 { + vals = map[string]interface{}{} + } + return +} + +// A local call to the function above, which triggers the "move to heap" +// of the output param. +func CallReadValues(filename string) (map[string]interface{}, error) { + defer func() { G++ }() + data, err := ioutil.ReadFile(filename) + if err != nil { + return map[string]interface{}{}, err + } + return ReadValues(data) +} diff --git a/test/fixedbugs/issue30908.dir/m.go b/test/fixedbugs/issue30908.dir/m.go new file mode 100644 index 0000000..a170a6e --- /dev/null +++ b/test/fixedbugs/issue30908.dir/m.go @@ -0,0 +1,21 @@ +// Copyright 2019 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 ( + "os" + + "./b" +) + +func main() { + seed := "some things are better" + bsl := []byte(seed) + b.CallReadValues("/dev/null") + vals, err := b.ReadValues(bsl) + if vals["better"] != seed || err != nil { + os.Exit(1) + } +} |