Adding upstream version 1.16.10.upstream/1.16.10upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 55 insertions, 0 deletions

diff --git a/test/fixedbugs/issue19467.dir/mysync.go b/test/fixedbugs/issue19467.dir/mysync.go
new file mode 100644
index 0000000..d0e6fe0
--- /dev/null
+++ b/test/fixedbugs/issue19467.dir/mysync.go
@@ -0,0 +1,21 @@
+// Copyright 2017 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 mysync
+
+import "runtime"
+
+type WaitGroup struct {
+	Callers []uintptr
+}
+
+func (wg *WaitGroup) Add(x int) {
+	wg.Callers = make([]uintptr, 32)
+	n := runtime.Callers(1, wg.Callers)
+	wg.Callers = wg.Callers[:n]
+}
+
+func (wg *WaitGroup) Done() {
+	wg.Add(-1)
+}
diff --git a/test/fixedbugs/issue19467.dir/z.go b/test/fixedbugs/issue19467.dir/z.go
new file mode 100644
index 0000000..d381103
--- /dev/null
+++ b/test/fixedbugs/issue19467.dir/z.go
@@ -0,0 +1,34 @@
+// Copyright 2017 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 (
+	"./mysync"
+	"log"
+	"runtime"
+)
+
+func main() {
+	var wg mysync.WaitGroup
+	wg.Done()
+	ci := runtime.CallersFrames(wg.Callers)
+	frames := make([]runtime.Frame, 0, 4)
+	for {
+		frame, more := ci.Next()
+		frames = append(frames, frame)
+		if !more {
+			break
+		}
+	}
+	expecting := []string{
+		"mysync.(*WaitGroup).Add",
+		"mysync.(*WaitGroup).Done",
+	}
+	for i := 0; i < 2; i++ {
+		if frames[i].Function != expecting[i] {
+			log.Fatalf("frame %d: got %s, want %s", i, frames[i].Function, expecting[i])
+		}
+	}
+}