cmd/internal/goobj: use unsafe.String in toString func

Change-Id: I93a5e0996e48cc74e6b2e39c3a4c7aa68fd6a3a0
GitHub-Last-Rev: afd8feb0deac34f671e0ed11ad55f6be427bd8b1
GitHub-Pull-Request: golang/go#61137
Reviewed-on: https://go-review.googlesource.com/c/go/+/507517
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/cmd/internal/goobj/objfile.go b/src/cmd/internal/goobj/objfile.go
index c9d7ca434c4dfd4f1232e17f7a2f08c0e479773f..a8d68d873d630fe67fb8108b14adc5b396fb0da3 100644 (file)
--- a/src/cmd/internal/goobj/objfile.go
+++ b/src/cmd/internal/goobj/objfile.go
@@ -23,7 +23,6 @@ import (
        "encoding/binary"
        "errors"
        "fmt"
-       "internal/unsafeheader"
        "unsafe"
 )
 
@@ -662,13 +661,7 @@ func toString(b []byte) string {
        if len(b) == 0 {
                return ""
        }
-
-       var s string
-       hdr := (*unsafeheader.String)(unsafe.Pointer(&s))
-       hdr.Data = unsafe.Pointer(&b[0])
-       hdr.Len = len(b)
-
-       return s
+       return unsafe.String(&b[0], len(b))
 }
 
 func (r *Reader) StringRef(off uint32) string {