diff options
author | Josh Bleecher Snyder <josharian@gmail.com> | 2017-02-28 13:44:33 -0800 |
---|---|---|
committer | Austin Clements <austin@google.com> | 2017-04-05 16:58:29 +0000 |
commit | 752b8b773de301ef8afe838e71d7a5f23f941b1a (patch) | |
tree | 918fce662db0deabb78857682f107bdc9f590ad0 | |
parent | ff5695d0fdc41deb22053cb1daf7dd338b86f40d (diff) | |
download | go-752b8b773de301ef8afe838e71d7a5f23f941b1a.tar.gz go-752b8b773de301ef8afe838e71d7a5f23f941b1a.zip |
[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>
-rw-r--r-- | src/cmd/compile/internal/gc/typecheck.go | 11 | ||||
-rw-r--r-- | test/fixedbugs/issue19323.go | 19 |
2 files changed, 24 insertions, 6 deletions
diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go index 5ec1c9e2f2..7cfd951fde 100644 --- a/src/cmd/compile/internal/gc/typecheck.go +++ b/src/cmd/compile/internal/gc/typecheck.go @@ -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 { diff --git a/test/fixedbugs/issue19323.go b/test/fixedbugs/issue19323.go new file mode 100644 index 0000000000..f90af660d5 --- /dev/null +++ b/test/fixedbugs/issue19323.go @@ -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" +} |