From: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Date: Wed, 8 Jun 2022 04:05:28 +0000 (+0700)
Subject: [dev.unified] cmd/compile: drop package height from Unified IR importer
X-Git-Tag: go1.20rc1~1807^2~38
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4b78ece3d7;p=gostls13.git

[dev.unified] cmd/compile: drop package height from Unified IR importer

CL 410342 removed package height, but still needs to keep writing out 0
for iexport for compatibility with existing importers. With Unified IR,
we don't have to, so get rid of the package height completely.

Change-Id: I84a285cbaddd7bb0833d45a24a6818231b4d2b71
Reviewed-on: https://go-review.googlesource.com/c/go/+/411014
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Cuong Manh Le <cuong.manhle.vn@gmail.com>
---

diff --git a/src/cmd/compile/internal/importer/ureader.go b/src/cmd/compile/internal/importer/ureader.go
index dc5614c841..ccd4c7c502 100644
--- a/src/cmd/compile/internal/importer/ureader.go
+++ b/src/cmd/compile/internal/importer/ureader.go
@@ -162,8 +162,6 @@ func (r *reader) doPkg() *types2.Package {
 	}
 
 	name := r.String()
-	_ = r.Len() // was package height, but not necessary anymore.
-
 	pkg := types2.NewPackage(path, name)
 	r.p.imports[path] = pkg
 
diff --git a/src/cmd/compile/internal/noder/reader.go b/src/cmd/compile/internal/noder/reader.go
index fed500bcf1..c8ed8552cd 100644
--- a/src/cmd/compile/internal/noder/reader.go
+++ b/src/cmd/compile/internal/noder/reader.go
@@ -292,7 +292,6 @@ func (r *reader) doPkg() *types.Pkg {
 	}
 
 	name := r.String()
-	_ = r.Len() // was package height, but not necessary anymore.
 
 	pkg := types.NewPkg(path, "")
 
diff --git a/src/cmd/compile/internal/noder/writer.go b/src/cmd/compile/internal/noder/writer.go
index 0537d1d3b2..ff026ba5ca 100644
--- a/src/cmd/compile/internal/noder/writer.go
+++ b/src/cmd/compile/internal/noder/writer.go
@@ -328,7 +328,6 @@ func (pw *pkgWriter) pkgIdx(pkg *types2.Package) pkgbits.Index {
 		base.Assertf(path != "builtin" && path != "unsafe", "unexpected path for user-defined package: %q", path)
 		w.String(path)
 		w.String(pkg.Name())
-		w.Len(0) // was package height, but not necessary anymore.
 
 		w.Len(len(pkg.Imports()))
 		for _, imp := range pkg.Imports() {
diff --git a/src/go/internal/gcimporter/ureader.go b/src/go/internal/gcimporter/ureader.go
index 3b14232c81..63718a59e1 100644
--- a/src/go/internal/gcimporter/ureader.go
+++ b/src/go/internal/gcimporter/ureader.go
@@ -198,10 +198,8 @@ func (r *reader) doPkg() *types.Package {
 	}
 
 	name := r.String()
-	height := r.Len()
 
-	// Was: "pkg := types.NewPackageHeight(path, name, height)"
-	pkg, _ := types.NewPackage(path, name), height
+	pkg := types.NewPackage(path, name)
 	r.p.imports[path] = pkg
 
 	imports := make([]*types.Package, r.Len())