From 03a1dc3522f99bf5045fc41730e6682c1cc7402a Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Wed, 28 Sep 2016 15:04:00 -0700 Subject: [PATCH] cmd/compile: don't crash on (unsafe.Sizeof)(0) Fixes #17270. Change-Id: I4affa57e10baf1a758bc0977265d160f220b2945 Reviewed-on: https://go-review.googlesource.com/29960 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/cmd/compile/internal/gc/typecheck.go | 36 +++++++++++------------- test/fixedbugs/issue17270.go | 11 ++++++++ 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 test/fixedbugs/issue17270.go diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go index 3ad869f98b..7bf577cdc8 100644 --- a/src/cmd/compile/internal/gc/typecheck.go +++ b/src/cmd/compile/internal/gc/typecheck.go @@ -1185,11 +1185,12 @@ OpSwitch: // call and call like case OCALL: + n.Left = typecheck(n.Left, Erv|Etype|Ecall) + n.Diag |= n.Left.Diag l := n.Left if l.Op == ONAME { - r := unsafenmagic(n) - if r != nil { + if r := unsafenmagic(n); r != nil { if n.Isddd { yyerror("invalid use of ... with builtin %v", l) } @@ -1197,25 +1198,22 @@ OpSwitch: n = typecheck1(n, top) return n } - } - n.Left = typecheck(n.Left, Erv|Etype|Ecall) - n.Diag |= n.Left.Diag - l = n.Left - if l.Op == ONAME && l.Etype != 0 { - // TODO(marvin): Fix Node.EType type union. - if n.Isddd && Op(l.Etype) != OAPPEND { - yyerror("invalid use of ... with builtin %v", l) + if l.Etype != 0 { + // TODO(marvin): Fix Node.EType type union. + if n.Isddd && Op(l.Etype) != OAPPEND { + yyerror("invalid use of ... with builtin %v", l) + } + + // builtin: OLEN, OCAP, etc. + // TODO(marvin): Fix Node.EType type union. + n.Op = Op(l.Etype) + + n.Left = n.Right + n.Right = nil + n = typecheck1(n, top) + return n } - - // builtin: OLEN, OCAP, etc. - // TODO(marvin): Fix Node.EType type union. - n.Op = Op(l.Etype) - - n.Left = n.Right - n.Right = nil - n = typecheck1(n, top) - return n } n.Left = defaultlit(n.Left, nil) diff --git a/test/fixedbugs/issue17270.go b/test/fixedbugs/issue17270.go new file mode 100644 index 0000000000..5c009b58df --- /dev/null +++ b/test/fixedbugs/issue17270.go @@ -0,0 +1,11 @@ +// compile + +// 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 + +import "unsafe" + +const _ = (unsafe.Sizeof)(0)