6 files changed, 8 insertions, 8 deletions
diff --git a/src/cmd/internal/edit/edit.go b/src/cmd/internal/edit/edit.go
index 2d470f4c8a..57c0820eb1 100644
--- a/src/cmd/internal/edit/edit.go
+++ b/src/cmd/internal/edit/edit.go
@@ -71,7 +71,7 @@ func (b *Buffer) Bytes() []byte {
 	// to be applied before a replacement of the text at [x, y).
 	sort.Stable(b.q)
 
-	var new []byte
+	new := make([]byte, 0, len(b.q))
 	offset := 0
 	for i, e := range b.q {
 		if e.start < offset {
diff --git a/src/cmd/internal/objfile/elf.go b/src/cmd/internal/objfile/elf.go
index f25e4a65d6..e12e273684 100644
--- a/src/cmd/internal/objfile/elf.go
+++ b/src/cmd/internal/objfile/elf.go
@@ -32,7 +32,7 @@ func (f *elfFile) symbols() ([]Sym, error) {
 		return nil, err
 	}
 
-	var syms []Sym
+	syms := make([]Sym, 0, len(elfSyms))
 	for _, s := range elfSyms {
 		sym := Sym{Addr: s.Value, Name: s.Name, Size: int64(s.Size), Code: '?'}
 		switch s.Section {
diff --git a/src/cmd/internal/objfile/macho.go b/src/cmd/internal/objfile/macho.go
index c92497527a..cdea87d9a9 100644
--- a/src/cmd/internal/objfile/macho.go
+++ b/src/cmd/internal/objfile/macho.go
@@ -44,7 +44,7 @@ func (f *machoFile) symbols() ([]Sym, error) {
 	}
 	sort.Sort(uint64s(addrs))
 
-	var syms []Sym
+	syms := make([]Sym, 0, len(f.macho.Symtab.Syms))
 	for _, s := range f.macho.Symtab.Syms {
 		if s.Type&stabTypeMask != 0 {
 			// Skip stab debug info.
diff --git a/src/cmd/internal/objfile/pe.go b/src/cmd/internal/objfile/pe.go
index 4c4be1e6b7..df7e5f8cea 100644
--- a/src/cmd/internal/objfile/pe.go
+++ b/src/cmd/internal/objfile/pe.go
@@ -29,11 +29,11 @@ func openPE(r io.ReaderAt) (rawFile, error) {
 func (f *peFile) symbols() ([]Sym, error) {
 	// Build sorted list of addresses of all symbols.
 	// We infer the size of a symbol by looking at where the next symbol begins.
-	var addrs []uint64
+	addrs := make([]uint64, 0, len(f.pe.Symbols))
 
 	imageBase, _ := f.imageBase()
 
-	var syms []Sym
+	syms := make([]Sym, 0, len(f.pe.Symbols))
 	for _, s := range f.pe.Symbols {
 		const (
 			N_UNDEF = 0  // An undefined (extern) symbol
diff --git a/src/cmd/internal/objfile/plan9obj.go b/src/cmd/internal/objfile/plan9obj.go
index da0b345f53..86d052ec4d 100644
--- a/src/cmd/internal/objfile/plan9obj.go
+++ b/src/cmd/internal/objfile/plan9obj.go
@@ -44,7 +44,7 @@ func (f *plan9File) symbols() ([]Sym, error) {
 
 	// Build sorted list of addresses of all symbols.
 	// We infer the size of a symbol by looking at where the next symbol begins.
-	var addrs []uint64
+	addrs := make([]uint64, 0, len(plan9Syms))
 	for _, s := range plan9Syms {
 		if !validSymType[s.Type] {
 			continue
@@ -53,7 +53,7 @@ func (f *plan9File) symbols() ([]Sym, error) {
 	}
 	sort.Sort(uint64s(addrs))
 
-	var syms []Sym
+	syms := make([]Sym, 0, len(plan9Syms))
 
 	for _, s := range plan9Syms {
 		if !validSymType[s.Type] {
diff --git a/src/cmd/internal/objfile/xcoff.go b/src/cmd/internal/objfile/xcoff.go
index d6df4db8f0..fc32fc7c19 100644
--- a/src/cmd/internal/objfile/xcoff.go
+++ b/src/cmd/internal/objfile/xcoff.go
@@ -27,7 +27,7 @@ func openXcoff(r io.ReaderAt) (rawFile, error) {
 }
 
 func (f *xcoffFile) symbols() ([]Sym, error) {
-	var syms []Sym
+	syms := make([]Sym, 0, len(f.xcoff.Symbols))
 	for _, s := range f.xcoff.Symbols {
 		const (
 			N_UNDEF = 0  // An undefined (extern) symbol