diff options
Diffstat (limited to 'backport-0019-release-branch.go1.21-cmd-compile-fix-escape-analysi.patch')
| -rw-r--r-- | backport-0019-release-branch.go1.21-cmd-compile-fix-escape-analysi.patch | 112 |
1 files changed, 112 insertions, 0 deletions
diff --git a/backport-0019-release-branch.go1.21-cmd-compile-fix-escape-analysi.patch b/backport-0019-release-branch.go1.21-cmd-compile-fix-escape-analysi.patch new file mode 100644 index 0000000..8aa6e2e --- /dev/null +++ b/backport-0019-release-branch.go1.21-cmd-compile-fix-escape-analysi.patch @@ -0,0 +1,112 @@ +From ce09caaeea688251e21a1749ccb89d9160fe2fb2 Mon Sep 17 00:00:00 2001 +From: Matthew Dempsky <mdempsky@google.com> +Date: Tue, 5 Dec 2023 12:56:04 -0800 +Subject: [PATCH 06/20] [release-branch.go1.21] cmd/compile: fix escape + analysis of string min/max + +Conflict:NA +Reference:https://go-review.googlesource.com/c/go/+/547715 + +When I was plumbing min/max support through the compiler, I was +thinking mostly about numeric argument types. As a result, I forgot +that escape analysis would need to be aware that min/max can operate +on string values, which contain pointers. + +Updates #64565. +Fixes #64567. + +Change-Id: I36127ce5a2da942401910fa0f9de922726c9f94d +Reviewed-on: https://go-review.googlesource.com/c/go/+/547715 +Reviewed-by: Keith Randall <khr@google.com> +Reviewed-by: Mauri de Souza Meneguzzo <mauri870@gmail.com> +Auto-Submit: Matthew Dempsky <mdempsky@google.com> +LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> +(cherry picked from commit 34416d7f6f93cd6562636e311c362ebe421f1a4c) +Reviewed-on: https://go-review.googlesource.com/c/go/+/547757 +Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com> +Reviewed-by: Keith Randall <khr@golang.org> +--- + src/cmd/compile/internal/escape/call.go | 10 +++++++++- + test/escape_calls.go | 7 +++++++ + test/fixedbugs/issue64565.go | 15 +++++++++++++++ + test/fixedbugs/issue64565.out | 3 +++ + 4 files changed, 34 insertions(+), 1 deletion(-) + create mode 100644 test/fixedbugs/issue64565.go + create mode 100644 test/fixedbugs/issue64565.out + +diff --git a/src/cmd/compile/internal/escape/call.go b/src/cmd/compile/internal/escape/call.go +index c69eca199877..36e606bf2090 100644 +--- a/src/cmd/compile/internal/escape/call.go ++++ b/src/cmd/compile/internal/escape/call.go +@@ -186,7 +186,7 @@ func (e *escape) callCommon(ks []hole, call ir.Node, init *ir.Nodes, wrapper *ir + argument(e.discardHole(), &call.X) + argument(e.discardHole(), &call.Y) + +- case ir.ODELETE, ir.OMAX, ir.OMIN, ir.OPRINT, ir.OPRINTN, ir.ORECOVER: ++ case ir.ODELETE, ir.OPRINT, ir.OPRINTN, ir.ORECOVER: + call := call.(*ir.CallExpr) + fixRecoverCall(call) + for i := range call.Args { +@@ -194,6 +194,14 @@ func (e *escape) callCommon(ks []hole, call ir.Node, init *ir.Nodes, wrapper *ir + } + argumentRType(&call.RType) + ++ case ir.OMIN, ir.OMAX: ++ call := call.(*ir.CallExpr) ++ fixRecoverCall(call) ++ for i := range call.Args { ++ argument(ks[0], &call.Args[i]) ++ } ++ argumentRType(&call.RType) ++ + case ir.OLEN, ir.OCAP, ir.OREAL, ir.OIMAG, ir.OCLOSE, ir.OCLEAR: + call := call.(*ir.UnaryExpr) + argument(e.discardHole(), &call.X) +diff --git a/test/escape_calls.go b/test/escape_calls.go +index aa7c7f516cf9..5424c006ee4d 100644 +--- a/test/escape_calls.go ++++ b/test/escape_calls.go +@@ -52,3 +52,10 @@ func bar() { + s := "string" + f([]string{s}) // ERROR "\[\]string{...} escapes to heap" + } ++ ++func strmin(a, b, c string) string { // ERROR "leaking param: a to result ~r0 level=0" "leaking param: b to result ~r0 level=0" "leaking param: c to result ~r0 level=0" ++ return min(a, b, c) ++} ++func strmax(a, b, c string) string { // ERROR "leaking param: a to result ~r0 level=0" "leaking param: b to result ~r0 level=0" "leaking param: c to result ~r0 level=0" ++ return max(a, b, c) ++} +diff --git a/test/fixedbugs/issue64565.go b/test/fixedbugs/issue64565.go +new file mode 100644 +index 000000000000..634025ce3ece +--- /dev/null ++++ b/test/fixedbugs/issue64565.go +@@ -0,0 +1,15 @@ ++// run ++ ++// Copyright 2023 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 ++ ++func main() { ++ m := "0" ++ for _, c := range "321" { ++ m = max(string(c), m) ++ println(m) ++ } ++} +diff --git a/test/fixedbugs/issue64565.out b/test/fixedbugs/issue64565.out +new file mode 100644 +index 000000000000..1f242fa6f000 +--- /dev/null ++++ b/test/fixedbugs/issue64565.out +@@ -0,0 +1,3 @@ ++3 ++3 ++3 +-- +2.33.0 + |