Skip to content

Commit

Permalink
lang/go118: Revert upstream CL 411617
Browse files Browse the repository at this point in the history
Revert https://go-review.googlesource.com/c/go/+/411617 that introduced
the regression that broke security/gopass and
security/git-credential-gopass.

See golang/go#53852 for more details.
  • Loading branch information
dmgk committed Jul 14, 2022
1 parent fbb6231 commit e57c55d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lang/go118/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go
Original file line number Diff line number Diff line change
@@ -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())

0 comments on commit e57c55d

Please sign in to comment.