lang/go118: Update to 1.18.5

Changes:	https://go.dev/doc/devel/release#go1.18.minor

Security:	7f8d5435-125a-11ed-9a69-10c37b4ac2ea
This commit is contained in:
Dmitri Goutnik 2022-08-03 15:21:33 -05:00
parent c610be429f
commit 3c8549c4a2
3 changed files with 5 additions and 23 deletions

View File

@ -1,6 +1,6 @@
DISTVERSION= 1.18.4
DISTVERSION= 1.18.5
# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
PORTREVISION= 1
PORTREVISION= 0
MASTER_SITES= https://golang.org/dl/ \
https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
LOCAL/dmgk:bootstrap

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1657714348
SHA256 (go1.18.4.src.tar.gz) = 4525aa6b0e3cecb57845f4060a7075aafc9ab752bb7b6b4cf8a212d43078e1e4
SIZE (go1.18.4.src.tar.gz) = 22845866
TIMESTAMP = 1659544915
SHA256 (go1.18.5.src.tar.gz) = 9920d3306a1ac536cdd2c796d6cb3c54bc559c226fc3cc39c32f1e0bd7f50d2a
SIZE (go1.18.5.src.tar.gz) = 22847094
SHA256 (go-freebsd-arm64-go1.17.9.tar.xz) = d9e9180bdc5ad0eec1654679a50084ebb31ecbe9bef24f0bd8ba917db8d1830c
SIZE (go-freebsd-arm64-go1.17.9.tar.xz) = 38572776
SHA256 (go-freebsd-amd64-go1.17.9.tar.xz) = fd439ad091ed57d0ad728c05fc60465aad2e46e98da96e2d5b60b0c470f2efec

View File

@ -1,18 +0,0 @@
Revert "[release-branch.go1.18] cmd/compile: fix missing dict pass for type assertions"
https://go-review.googlesource.com/c/go/+/417615
--- src/cmd/compile/internal/noder/stencil.go.orig 2022-07-12 15:22:53 UTC
+++ src/cmd/compile/internal/noder/stencil.go
@@ -1297,10 +1297,10 @@ func (g *genInst) dictPass(info *instInfo) {
m = convertUsingDictionary(info, info.dictParam, m.Pos(), mce.X, m, m.Type(), false)
}
case ir.ODOTTYPE, ir.ODOTTYPE2:
- dt := m.(*ir.TypeAssertExpr)
- if !dt.Type().HasShape() && !dt.X.Type().HasShape() {
+ if !m.Type().HasShape() {
break
}
+ dt := m.(*ir.TypeAssertExpr)
var rt ir.Node
if dt.Type().IsInterface() || dt.X.Type().IsEmptyInterface() {
ix := findDictType(info, m.Type())