From 577967799c22e5a443ec49f494039f80e08202fe Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Tue, 12 Sep 2017 13:42:10 -0700 Subject: [PATCH] cmd/compile: simplify exporting OTYPE nodes We only export packages that typechecked successfully, and OTYPE nodes will always have their Type field set. Changes the package export format, but only in the compiler-specific section. No version bump necessary. Change-Id: I722f5827e73948fceb0432bc8b3b22471fea8f61 Reviewed-on: https://go-review.googlesource.com/63273 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: Alan Donovan --- src/cmd/compile/internal/gc/bexport.go | 6 +----- src/cmd/compile/internal/gc/bimport.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/cmd/compile/internal/gc/bexport.go b/src/cmd/compile/internal/gc/bexport.go index 076b8a91e2..7608d927a5 100644 --- a/src/cmd/compile/internal/gc/bexport.go +++ b/src/cmd/compile/internal/gc/bexport.go @@ -1227,11 +1227,7 @@ func (p *exporter) expr(n *Node) { case OTYPE: p.op(OTYPE) p.pos(n) - if p.bool(n.Type == nil) { - p.sym(n) - } else { - p.typ(n.Type) - } + p.typ(n.Type) // case OTARRAY, OTMAP, OTCHAN, OTSTRUCT, OTINTER, OTFUNC: // should have been resolved by typechecking - handled by default case diff --git a/src/cmd/compile/internal/gc/bimport.go b/src/cmd/compile/internal/gc/bimport.go index 661d34112b..7cd155c4cb 100644 --- a/src/cmd/compile/internal/gc/bimport.go +++ b/src/cmd/compile/internal/gc/bimport.go @@ -947,11 +947,7 @@ func (p *importer) node() *Node { // unreachable - should have been resolved by typechecking case OTYPE: - pos := p.pos() - if p.bool() { - return npos(pos, mkname(p.sym())) - } - return npos(pos, typenod(p.typ())) + return npos(p.pos(), typenod(p.typ())) // case OTARRAY, OTMAP, OTCHAN, OTSTRUCT, OTINTER, OTFUNC: // unreachable - should have been resolved by typechecking -- 2.50.0