Skip to content

Commit

Permalink
cmd/compile: allow export/import OSLICE2ARRPTR
Browse files Browse the repository at this point in the history
Updates #395
Fixes #45665

Change-Id: Iaf053c0439a573e9193d40942fbdb22ac3b4d3bb
Reviewed-on: https://go-review.googlesource.com/c/go/+/312070
Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
  • Loading branch information
cuonglm committed Apr 21, 2021
1 parent 7735ec9 commit 5f1df26
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/cmd/compile/internal/typecheck/iexport.go
Original file line number Diff line number Diff line change
Expand Up @@ -1677,7 +1677,7 @@ func (w *exportWriter) expr(n ir.Node) {
w.op(ir.OEND)
}

case ir.OCONV, ir.OCONVIFACE, ir.OCONVNOP, ir.OBYTES2STR, ir.ORUNES2STR, ir.OSTR2BYTES, ir.OSTR2RUNES, ir.ORUNESTR:
case ir.OCONV, ir.OCONVIFACE, ir.OCONVNOP, ir.OBYTES2STR, ir.ORUNES2STR, ir.OSTR2BYTES, ir.OSTR2RUNES, ir.ORUNESTR, ir.OSLICE2ARRPTR:
n := n.(*ir.ConvExpr)
if go117ExportTypes {
w.op(n.Op())
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/compile/internal/typecheck/iimport.go
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ func (r *importReader) node() ir.Node {
}
return n

case ir.OCONV, ir.OCONVIFACE, ir.OCONVNOP, ir.OBYTES2STR, ir.ORUNES2STR, ir.OSTR2BYTES, ir.OSTR2RUNES, ir.ORUNESTR:
case ir.OCONV, ir.OCONVIFACE, ir.OCONVNOP, ir.OBYTES2STR, ir.ORUNES2STR, ir.OSTR2BYTES, ir.OSTR2RUNES, ir.ORUNESTR, ir.OSLICE2ARRPTR:
if !go117ExportTypes && op != ir.OCONV {
// unreachable - mapped to OCONV case by exporter
goto error
Expand Down
15 changes: 15 additions & 0 deletions test/fixedbugs/issue45665.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// compile

// Copyright 2021 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() {
Get([]string{"a", "b"})
}

func Get(ss []string) *[2]string {
return (*[2]string)(ss)
}

0 comments on commit 5f1df26

Please sign in to comment.