cmd/compile: use (*strings.Reader).Reset

Since when go1.17 is now used for bootstraping.

Change-Id: If28338fc82e6c61f057d7eb3a4c2ed77846167df
Reviewed-on: https://go-review.googlesource.com/c/go/+/427558
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Auto-Submit: Keith Randall <khr@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Run-TryBot: hopehook <hopehook@golangcn.org>

diff --git a/src/cmd/compile/internal/importer/iimport.go b/src/cmd/compile/internal/importer/iimport.go
index 440f557a80da443a1859c23d261d4763805f4cde..82aff18335472b6e17107f0f68675018687d446b 100644 (file)
--- a/src/cmd/compile/internal/importer/iimport.go
+++ b/src/cmd/compile/internal/importer/iimport.go
@@ -233,10 +233,7 @@ func (p *iimporter) doDecl(pkg *types2.Package, name string) {
        }
 
        r := &importReader{p: p, currPkg: pkg}
-       // Reader.Reset is not available in Go 1.4.
-       // Use bytes.NewReader for now.
-       // r.declReader.Reset(p.declData[off:])
-       r.declReader = *strings.NewReader(p.declData[off:])
+       r.declReader.Reset(p.declData[off:])
 
        r.obj(name)
 }
@@ -282,10 +279,7 @@ func (p *iimporter) typAt(off uint64, base *types2.Named) types2.Type {
        }
 
        r := &importReader{p: p}
-       // Reader.Reset is not available in Go 1.4.
-       // Use bytes.NewReader for now.
-       // r.declReader.Reset(p.declData[off-predeclReserved:])
-       r.declReader = *strings.NewReader(p.declData[off-predeclReserved:])
+       r.declReader.Reset(p.declData[off-predeclReserved:])
        t := r.doType(base)
 
        if canReuse(base, t) {

diff --git a/src/cmd/compile/internal/typecheck/iimport.go b/src/cmd/compile/internal/typecheck/iimport.go
index a08f62b4146cd929eb9fd87a7e302985b8a24a5d..80ae0259e861b9f6720616850afa468c708276ec 100644 (file)
--- a/src/cmd/compile/internal/typecheck/iimport.go
+++ b/src/cmd/compile/internal/typecheck/iimport.go
@@ -280,9 +280,7 @@ func (p *iimporter) newReader(off uint64, pkg *types.Pkg) *importReader {
                p:       p,
                currPkg: pkg,
        }
-       // (*strings.Reader).Reset wasn't added until Go 1.7, and we
-       // need to build with Go 1.4.
-       r.Reader = *strings.NewReader(p.declData[off:])
+       r.Reader.Reset(p.declData[off:])
        return r
 }