From nobody Thu Jul 14 21:46:33 2022 X-Original-To: dev-commits-ports-all@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 4LkSk15Dnrz4T1JB; Thu, 14 Jul 2022 21:46:33 +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 4LkSk14gfPz3hRH; Thu, 14 Jul 2022 21:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657835193; 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=+kz4Xupp1BsinalnxWxxo+/bW1IvxP3wE2lvpQ/pVwQ=; b=pAk4J7dcDnKfXjmr/EKtiKASZMIKYygUFFSqNOTQL1xuNXSsjz3f843QgqAqFg/+i/WHGJ Ov0x344UlDCX07YWMBIoVwPXyBwBjcM1v6d4WbkTX457Ursl9pPdxSwCjHvuMFyXg5iBCC prYfKC3gAijqwmNBI43EIoY/8c1vi1kw2e9a7H+C+45qsDmPFhIXPysY76nWoLbG/omygU fe1UA9JC177vbftxKxM86wLXPH6qJQMdiAZDgD7AgZBW50tnlusjcnwG0+k95IF1K4HXid RqozcJFk2cqCSHRoXl0YNWvsTjc8kc3xtFGHm+KTW/PfpqFvVoy4QjhzK8FNpw== 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 4LkSk13h35zJYp; Thu, 14 Jul 2022 21:46:33 +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 26ELkXCk011097; Thu, 14 Jul 2022 21:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ELkX80011096; Thu, 14 Jul 2022 21:46:33 GMT (envelope-from git) Date: Thu, 14 Jul 2022 21:46:33 GMT Message-Id: <202207142146.26ELkX80011096@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: e57c55d79885 - main - lang/go118: Revert upstream CL 411617 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: e57c55d798851551d17f968d8c5c457e70804505 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657835193; 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=+kz4Xupp1BsinalnxWxxo+/bW1IvxP3wE2lvpQ/pVwQ=; b=J+WtA6O//GoVU3q2yfrTfTzt4tfK/vywsBpQgcrnD96DApE8gVuBnyEdQxz5PNTGtgCBey g9W0tFgSTiF9N6zXNOwhxOj5FCw6Dj/MdWgYZ2warYfEyK8HT3+I2Uc6tPP3qrlxziSBRO 2Rh6Ns0kG+KmyCt1HVr37e6iFi6I3460phObHcwoZKtFdYa1stiFIXJDMeYIlmIDes4q2A l+3VFUG8f490bdJC7ArbpF7+X1d2zefii+YHuRTybUrM+avXsOXt7+Gm1eCGgdtlC67CK+ A1nLvucRvoGL0S8sMtBWeFtkopbd9xQfcZJ62JXVX/3LZoBGjHeRrkyHj+2R3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657835193; a=rsa-sha256; cv=none; b=iv81pjit76QN/9XoG7C7DrgnpE2Cglj3wrEkHTX59Ktb2tl/PlPcY1jyNOXwYw03qm+6NW jfnXdbXEmp4Zz8vaNN3E4bdfJOmXO1VALYeGrbSavX2b5nAOCvWhnA4WhtVGYO2FSM/pNL nb00JDO3vsaH7gd0eJOMVcEHfvAvTLpwyjOdwu5vVIIWnHNPnL3sVCE5WwIuYa5mFy7Y0e jUUY5wzBYCWOY/qjHjFkTG7xaJIAhZbFo3E/tvqXMbvIsz/Bn8W2nyxC+dT1xRkGcdwunJ h5w934F1eqe0GAhMPQkOQ/TQfUVQww7ZlNJI6F2/NcjwhFjsT/7CQfV7YR2pmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=e57c55d798851551d17f968d8c5c457e70804505 commit e57c55d798851551d17f968d8c5c457e70804505 Author: Dmitri Goutnik AuthorDate: 2022-07-14 17:21:29 +0000 Commit: Dmitri Goutnik CommitDate: 2022-07-14 21:46:11 +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. --- 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())