From nobody Thu Jul 14 21:55:34 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LkSwQ4rn1z4T2Sc; Thu, 14 Jul 2022 21:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LkSwQ4Nfxz3hsg; Thu, 14 Jul 2022 21:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657835734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+wQGuQEThWn+T71PTJnpfV0N2Ir3XDxaO+TMj+gjCRk=; b=tJFfFmtIe1uYes8mhl3OdVACzCV5wrPI1O2MWG3S/R1DFMl5okxy2KWo6UOG1L01All94H JB6YLKdtT/TEcdYFpn0g7e8is+yKLSnmKSaWiesxhNoH6W3FFCDmuWi69/TPWKO5nOX8OC Xpq1zUCfXdzn1rcldMxEkRWhTds4QmiGlUxI0o4HPDWhayPe9Rd9+345VA5QeeemoKcetP dv4Q+nZKHFAOF495k3ufwf6ARk+7s7fHViqHW+HSes7Opo+VBOHS/8d1PzehXxP8W99fKr 8Llnb1cG2OGXvNijdyjH6MJsKQEYtrE/QQclOKopYwyohUVZWXMrnHNW47rw+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LkSwQ3RCVzJD6; Thu, 14 Jul 2022 21:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26ELtY8M024210; Thu, 14 Jul 2022 21:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ELtYLh024209; Thu, 14 Jul 2022 21:55:34 GMT (envelope-from git) Date: Thu, 14 Jul 2022 21:55:34 GMT Message-Id: <202207142155.26ELtYLh024209@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dmitri Goutnik Subject: git: ecdb4434a5c0 - 2022Q3 - lang/go118: Revert upstream CL 411617 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: ecdb4434a5c0728e1d14911cd8a04e46e42abc25 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657835734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+wQGuQEThWn+T71PTJnpfV0N2Ir3XDxaO+TMj+gjCRk=; b=n3RmvQ0xmPWQcnSzfGB0iquPdcMtEF4/3/bNV4Sw0vNxyu+QF5kbk7Il/DUqSuBMjFdqVb VDZM7gHTwAqL4Ma3Q6m2vRt4lhji5zP1gcRjauJWBPQK2CFVr8HPzLvvKhmGYXgcw4U6um UdDB8WCo6SOCw2qWeJhmH4vPGGZ24klc4CT9X4jBRxmiVjnDm3t0yctxE0dVrSleNBx2Zu HJX7O77eiWLhefbj+CZ0hztvr/L2pGUgezr4Wu9fF2E7jbcnPDQPZlUuwgHN2PgVO7UPSp QbTsrIlzn5OEf83B5PzlDbPK026vmCnRW5nm1ZjvEDsAR69EIpFcoPEBzXMWvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657835734; a=rsa-sha256; cv=none; b=FKHaqm3wJdPfiwe34I7LPzpUkBgL9VxZO0bRoKrSGYRj9cF0X0K2TVnjdPX9SuSS3Ea0es JvnIywnvJjqVISNrgLpFH47TqibGV8Hsl13o/FfU1DiDlvLWssaKsbFmpcfqs6X42LKxiH dVn/fO+U79V4Kt25hy8+P7ANThfEVHKJyNkwpGCvl78sla1iONihVTADDF/vAbX0meRsg0 Nf6S13hEgkIdPWJ91lEs34NkTnH9/ClZeskuvG3LeO1moQ3s9yXru0ON8YByAyCVf2nS6X XuM8WkQKz2ZXp7DXWaV/U3+Yjnh8fEsxlRspoll1NyfeLxd24EYbKlEQ5kELpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecdb4434a5c0728e1d14911cd8a04e46e42abc25 commit ecdb4434a5c0728e1d14911cd8a04e46e42abc25 Author: Dmitri Goutnik AuthorDate: 2022-07-14 17:21:29 +0000 Commit: Dmitri Goutnik CommitDate: 2022-07-14 21:47:29 +0000 lang/go118: Revert upstream CL 411617 Revert https://go-review.googlesource.com/c/go/+/411617 that introduced the regression that broke security/gopass and security/git-credential-gopass. See https://github.com/golang/go/issues/53852 for more details. Approved by: portmgr blanket (build fix) (cherry picked from commit e57c55d798851551d17f968d8c5c457e70804505) --- lang/go118/Makefile | 2 +- .../patch-src_cmd_compile_internal_noder_stencil.go | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lang/go118/Makefile b/lang/go118/Makefile index 76c33efd3968..2eae4e7b4bd4 100644 --- a/lang/go118/Makefile +++ b/lang/go118/Makefile @@ -2,7 +2,7 @@ DISTVERSION= 1.18.4 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel -PORTREVISION= 0 +PORTREVISION= 1 MASTER_SITES= https://golang.org/dl/ \ https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \ LOCAL/dmgk:bootstrap diff --git a/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go b/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go new file mode 100644 index 000000000000..350f3e289af8 --- /dev/null +++ b/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go @@ -0,0 +1,18 @@ +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())