From 28279238004da8e83e3d652b4bcd14d6795c6148 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Fri, 21 Oct 2016 13:44:29 -0700 Subject: [PATCH] cmd/compile: prevent ICE from misuse of [...]T arrays Fixes #16428. Change-Id: I78d37472e228402bb3c06d7ebd441952386fa38a Reviewed-on: https://go-review.googlesource.com/31731 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: Robert Griesemer --- src/cmd/compile/internal/gc/typecheck.go | 13 ++++++++----- test/fixedbugs/issue16428.go | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 test/fixedbugs/issue16428.go diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go index 182bf0727a..2f30967e66 100644 --- a/src/cmd/compile/internal/gc/typecheck.go +++ b/src/cmd/compile/internal/gc/typecheck.go @@ -344,12 +344,15 @@ OpSwitch: if n.Left == nil { t = typSlice(r.Type) } else if n.Left.Op == ODDD { - t = typDDDArray(r.Type) - if top&Ecomplit == 0 && n.Diag == 0 { - t.Broke = true - n.Diag = 1 - yyerror("use of [...] array outside of array literal") + if top&Ecomplit == 0 { + if n.Diag == 0 { + n.Diag = 1 + yyerror("use of [...] array outside of array literal") + } + n.Type = nil + return n } + t = typDDDArray(r.Type) } else { n.Left = indexlit(typecheck(n.Left, Erv)) l := n.Left diff --git a/test/fixedbugs/issue16428.go b/test/fixedbugs/issue16428.go new file mode 100644 index 0000000000..5696d186c7 --- /dev/null +++ b/test/fixedbugs/issue16428.go @@ -0,0 +1,12 @@ +// errorcheck + +// Copyright 2016 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 + +var ( + b = [...]byte("abc") // ERROR "outside of array literal" + s = len(b) +) -- 2.48.1