diff options
| author | Dan Scales <danscales@google.com> | 2021-06-28 11:50:26 -0700 |
|---|---|---|
| committer | Dan Scales <danscales@google.com> | 2021-06-28 20:52:43 +0000 |
| commit | 64e6c75924a57306d8009cef4802b0b9ca4b7891 (patch) | |
| tree | 3f16d92c562440a8379788b6ec72add637fe55b9 /src/cmd/compile/internal/noder/transform.go | |
| parent | f99b3fe2ab6b142bc49b653c6547655cb7114625 (diff) | |
| download | go-64e6c75924a57306d8009cef4802b0b9ca4b7891.tar.gz go-64e6c75924a57306d8009cef4802b0b9ca4b7891.zip | |
[dev.typeparams] cmd/compile: port fix for issue46725 to transform.go
Allow fix for issue46725 to work for -G=3 mode.
Change-Id: Id522fbc2278cf878cb3f95b3205a2122c164ae29
Reviewed-on: https://go-review.googlesource.com/c/go/+/331470
Trust: Dan Scales <danscales@google.com>
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Diffstat (limited to 'src/cmd/compile/internal/noder/transform.go')
| -rw-r--r-- | src/cmd/compile/internal/noder/transform.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/noder/transform.go b/src/cmd/compile/internal/noder/transform.go index c3fa8042f2..7a685c4b47 100644 --- a/src/cmd/compile/internal/noder/transform.go +++ b/src/cmd/compile/internal/noder/transform.go @@ -329,8 +329,20 @@ assignOK: r.Use = ir.CallUseList rtyp := r.Type() + mismatched := false + failed := false for i := range lhs { - checkLHS(i, rtyp.Field(i).Type) + result := rtyp.Field(i).Type + checkLHS(i, result) + + if lhs[i].Type() == nil || result == nil { + failed = true + } else if lhs[i] != ir.BlankNode && !types.Identical(lhs[i].Type(), result) { + mismatched = true + } + } + if mismatched && !failed { + typecheck.RewriteMultiValueCall(stmt, r) } return } |