Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile: cleanup toolstash hacks from previous CL

Browse source 
Change-Id: I36cf3523e00b80e2d3a690f251edd5d6f665d156
Reviewed-on: https://go-review.googlesource.com/30975
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Matthew Dempsky 2016-10-12 17:39:28 -07:00
parent add3ff549a
commit 01bf5cc219
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/compile/internal/gc/inl.go
View file

@ -248,10 +248,6 @@ func ishairy(n *Node, budget *int32, reason *string) bool {
} }
(*budget)-- (*budget)--
// TODO(mdempsky): Hack to appease toolstash; remove.
if n.Op == OSTRUCTKEY {
(*budget)--
}
return *budget < 0 || ishairy(n.Left, budget, reason) || ishairy(n.Right, budget, reason) || return *budget < 0 || ishairy(n.Left, budget, reason) || ishairy(n.Right, budget, reason) ||
ishairylist(n.List, budget, reason) || ishairylist(n.Rlist, budget, reason) || ishairylist(n.List, budget, reason) || ishairylist(n.Rlist, budget, reason) ||

4
src/cmd/compile/internal/gc/syntax.go
View file

@ -383,6 +383,7 @@ const (
OINDEX // Left[Right] (index of array or slice) OINDEX // Left[Right] (index of array or slice)
OINDEXMAP // Left[Right] (index of map) OINDEXMAP // Left[Right] (index of map)
OKEY // Left:Right (key:value in struct/array/map literal, or slice index pair) OKEY // Left:Right (key:value in struct/array/map literal, or slice index pair)
OSTRUCTKEY // Sym:Left (key:value in struct literal, after type checking)
OIDATA // data word of an interface value in Left; TODO: move next to OITAB once it is easier to regenerate the binary blob in builtin.go (issues 15835, 15839) OIDATA // data word of an interface value in Left; TODO: move next to OITAB once it is easier to regenerate the binary blob in builtin.go (issues 15835, 15839)
OLEN // len(Left) OLEN // len(Left)
OMAKE // make(List) (before type checking converts to one of the following) OMAKE // make(List) (before type checking converts to one of the following)
@ -483,9 +484,6 @@ const (
OGETG // runtime.getg() (read g pointer) OGETG // runtime.getg() (read g pointer)
OEND OEND
// TODO(mdempsky): Hack to appease toolstash; move up next to OKEY.
OSTRUCTKEY // Sym:Left (key:value in struct literal, after type checking)
) )
// Nodes is a pointer to a slice of *Node. // Nodes is a pointer to a slice of *Node.