From: Matthew Dempsky <mdempsky@google.com>
Date: Thu, 13 Oct 2016 00:39:28 +0000 (-0700)
Subject: cmd/compile: cleanup toolstash hacks from previous CL
X-Git-Tag: go1.8beta1~887
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=01bf5cc21912ff8642171d8255a7fff87f1da00b;p=gostls13.git

cmd/compile: cleanup toolstash hacks from previous CL

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>
---

diff --git a/src/cmd/compile/internal/gc/inl.go b/src/cmd/compile/internal/gc/inl.go
index 20d0d6ace1..9a8dede50d 100644
--- a/src/cmd/compile/internal/gc/inl.go
+++ b/src/cmd/compile/internal/gc/inl.go
@@ -248,10 +248,6 @@ func ishairy(n *Node, budget *int32, reason *string) bool {
 	}
 
 	(*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) ||
 		ishairylist(n.List, budget, reason) || ishairylist(n.Rlist, budget, reason) ||
diff --git a/src/cmd/compile/internal/gc/syntax.go b/src/cmd/compile/internal/gc/syntax.go
index 12c15b2eed..0f05f8c2d8 100644
--- a/src/cmd/compile/internal/gc/syntax.go
+++ b/src/cmd/compile/internal/gc/syntax.go
@@ -383,6 +383,7 @@ const (
 	OINDEX     // Left[Right] (index of array or slice)
 	OINDEXMAP  // Left[Right] (index of map)
 	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)
 	OLEN       // len(Left)
 	OMAKE      // make(List) (before type checking converts to one of the following)
@@ -483,9 +484,6 @@ const (
 	OGETG   // runtime.getg() (read g pointer)
 
 	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.