Skip to content

Commit 6681ff9

Browse files
Mark Freemangopherbot
Mark Freeman
authored andcommitted
pkgbits: replace references to RelocKind with SectionKind
Change-Id: Id194a42645d1da6440558bf12dc252f347072f86 Reviewed-on: https://go-review.googlesource.com/c/go/+/670175 Auto-Submit: Mark Freeman <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Mark Freeman <[email protected]> Reviewed-by: Robert Griesemer <[email protected]>
1 parent 66ea0ee commit 6681ff9

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

src/cmd/compile/internal/importer/ureader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ type readerTypeBound struct {
8484
boundIdx int
8585
}
8686

87-
func (pr *pkgReader) newReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
87+
func (pr *pkgReader) newReader(k pkgbits.SectionKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
8888
return &reader{
8989
Decoder: pr.NewDecoder(k, idx, marker),
9090
p: pr,
9191
}
9292
}
9393

94-
func (pr *pkgReader) tempReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
94+
func (pr *pkgReader) tempReader(k pkgbits.SectionKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
9595
return &reader{
9696
Decoder: pr.TempDecoder(k, idx, marker),
9797
p: pr,

src/cmd/compile/internal/noder/linker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (l *linker) relocAll(pr *pkgReader, relocs []pkgbits.RelocEnt) []pkgbits.Re
5858

5959
// relocIdx ensures a single element is copied into the output export
6060
// data file, and returns the corresponding index in the output.
61-
func (l *linker) relocIdx(pr *pkgReader, k pkgbits.RelocKind, idx index) index {
61+
func (l *linker) relocIdx(pr *pkgReader, k pkgbits.SectionKind, idx index) index {
6262
assert(pr != nil)
6363

6464
absIdx := pr.AbsIdx(k, idx)
@@ -252,7 +252,7 @@ func (l *linker) exportBody(obj *ir.Name, local bool) {
252252

253253
// relocCommon copies the specified element from pr into w,
254254
// recursively relocating any referenced elements as well.
255-
func (l *linker) relocCommon(pr *pkgReader, w *pkgbits.Encoder, k pkgbits.RelocKind, idx index) {
255+
func (l *linker) relocCommon(pr *pkgReader, w *pkgbits.Encoder, k pkgbits.SectionKind, idx index) {
256256
r := pr.NewDecoderRaw(k, idx)
257257
w.Relocs = l.relocAll(pr, r.Relocs)
258258
io.Copy(&w.Data, &r.Data)

src/cmd/compile/internal/noder/reader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ type pkgReaderIndex struct {
7474
synthetic func(pos src.XPos, r *reader)
7575
}
7676

77-
func (pri pkgReaderIndex) asReader(k pkgbits.RelocKind, marker pkgbits.SyncMarker) *reader {
77+
func (pri pkgReaderIndex) asReader(k pkgbits.SectionKind, marker pkgbits.SyncMarker) *reader {
7878
if pri.synthetic != nil {
7979
return &reader{synthetic: pri.synthetic}
8080
}
@@ -85,7 +85,7 @@ func (pri pkgReaderIndex) asReader(k pkgbits.RelocKind, marker pkgbits.SyncMarke
8585
return r
8686
}
8787

88-
func (pr *pkgReader) newReader(k pkgbits.RelocKind, idx index, marker pkgbits.SyncMarker) *reader {
88+
func (pr *pkgReader) newReader(k pkgbits.SectionKind, idx index, marker pkgbits.SyncMarker) *reader {
8989
return &reader{
9090
Decoder: pr.NewDecoder(k, idx, marker),
9191
p: pr,

src/cmd/compile/internal/noder/writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func (dict *writerDict) itabIdx(typInfo, ifaceInfo typeInfo) int {
367367
return idx
368368
}
369369

370-
func (pw *pkgWriter) newWriter(k pkgbits.RelocKind, marker pkgbits.SyncMarker) *writer {
370+
func (pw *pkgWriter) newWriter(k pkgbits.SectionKind, marker pkgbits.SyncMarker) *writer {
371371
return &writer{
372372
Encoder: pw.NewEncoder(k, marker),
373373
p: pw,

src/go/internal/gcimporter/ureader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,14 @@ type readerDict struct {
132132
derivedTypes []types.Type // lazily instantiated from derived
133133
}
134134

135-
func (pr *pkgReader) newReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
135+
func (pr *pkgReader) newReader(k pkgbits.SectionKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
136136
return &reader{
137137
Decoder: pr.NewDecoder(k, idx, marker),
138138
p: pr,
139139
}
140140
}
141141

142-
func (pr *pkgReader) tempReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
142+
func (pr *pkgReader) tempReader(k pkgbits.SectionKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
143143
return &reader{
144144
Decoder: pr.TempDecoder(k, idx, marker),
145145
p: pr,

src/internal/pkgbits/reloc.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
package pkgbits
66

7-
// A RelocKind indicates a section, as well as the ordering of sections within
7+
// A SectionKind indicates a section, as well as the ordering of sections within
88
// unified export data. Any object given a dedicated section can be referred to
99
// via a section / index pair (and thus dereferenced) in other sections.
10-
type RelocKind int32 // TODO(markfreeman): Replace with uint8.
11-
type SectionKind = RelocKind
10+
type SectionKind int32 // TODO(markfreeman): Replace with uint8.
1211

1312
const (
1413
RelocString SectionKind = iota

0 commit comments

Comments
 (0)