cmd/compile/internal/gc: remove toolstash hacks

Change-Id: I221f77075a25e934e20b41307758a89c19169e05
Reviewed-on: https://go-review.googlesource.com/c/145201
Reviewed-by: Robert Griesemer <gri@golang.org>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/gc/iexport.go b/src/cmd/compile/internal/gc/iexport.go
index efe2f99d7270f44eece7fb247c6cb4ab5373ffa5..d21378df4ab71d33f79ad30a2c82a19b4397b754 100644 (file)
--- a/src/cmd/compile/internal/gc/iexport.go
+++ b/src/cmd/compile/internal/gc/iexport.go
@@ -1102,7 +1102,6 @@ func (w *exportWriter) stmt(n *Node) {
        case OGOTO, OLABEL:
                w.op(op)
                w.pos(n.Pos)
-               w.op(ONAME) // TODO(mdempsky): Remove toolstash hack.
                w.string(n.Sym.Name)
 
        default:

diff --git a/src/cmd/compile/internal/gc/iimport.go b/src/cmd/compile/internal/gc/iimport.go
index a355b6d2c720959678fa1e310496a98e67cfde65..8614c7a14f3835c54df0af6d7c148870cb94c876 100644 (file)
--- a/src/cmd/compile/internal/gc/iimport.go
+++ b/src/cmd/compile/internal/gc/iimport.go
@@ -1044,9 +1044,6 @@ func (r *importReader) node() *Node {
 
        case OGOTO, OLABEL:
                n := nodl(r.pos(), op, nil, nil)
-               if op := r.op(); op != ONAME { // TODO(mdempsky): Remove toolstash check.
-                       Fatalf("got %v, want ONAME", op)
-               }
                n.Sym = lookup(r.string())
                return n