mirror of https://github.com/golang/go.git
[release-branch.go1.8] cmd/compile: don't crash when slicing non-slice
Fixes #19323 Fixes #19638 (backport) Change-Id: I92d1bdefb15de6178a577a4fa0f0dc004f791904 Reviewed-on: https://go-review.googlesource.com/39601 Run-TryBot: Austin Clements <austin@google.com> Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
parent
ff5695d0fd
commit
752b8b773d
|
|
@ -1107,7 +1107,7 @@ OpSwitch:
|
|||
|
||||
case OSLICE, OSLICE3:
|
||||
ok |= Erv
|
||||
n.Left = typecheck(n.Left, top)
|
||||
n.Left = typecheck(n.Left, Erv)
|
||||
low, high, max := n.SliceBounds()
|
||||
hasmax := n.Op.IsSlice3()
|
||||
low = typecheck(low, Erv)
|
||||
|
|
@ -1119,6 +1119,10 @@ OpSwitch:
|
|||
max = indexlit(max)
|
||||
n.SetSliceBounds(low, high, max)
|
||||
l := n.Left
|
||||
if l.Type == nil {
|
||||
n.Type = nil
|
||||
return n
|
||||
}
|
||||
if l.Type.IsArray() {
|
||||
if !islvalue(n.Left) {
|
||||
yyerror("invalid operation %v (slice of unaddressable value)", n)
|
||||
|
|
@ -1131,12 +1135,7 @@ OpSwitch:
|
|||
n.Left = typecheck(n.Left, Erv)
|
||||
l = n.Left
|
||||
}
|
||||
|
||||
t := l.Type
|
||||
if t == nil {
|
||||
n.Type = nil
|
||||
return n
|
||||
}
|
||||
var tp *Type
|
||||
if t.IsString() {
|
||||
if hasmax {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
// errorcheck
|
||||
|
||||
// Copyright 2017 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 p
|
||||
|
||||
func g() {}
|
||||
|
||||
func f() {
|
||||
g()[:] // ERROR "g.. used as value"
|
||||
}
|
||||
|
||||
func g2() ([]byte, []byte) { return nil, nil }
|
||||
|
||||
func f2() {
|
||||
g2()[:] // ERROR "multiple-value g2.. in single-value context"
|
||||
}
|
||||
Loading…
Reference in New Issue