]> Cypherpunks repositories - gostls13.git/commitdiff
[dev.link] cmd/link: fix up stray references to legacy "newdie" function
authorThan McIntosh <thanm@google.com>
Tue, 10 Mar 2020 14:01:11 +0000 (10:01 -0400)
committerThan McIntosh <thanm@google.com>
Tue, 10 Mar 2020 17:18:55 +0000 (17:18 +0000)
In a couple of places in the DWARF type generation code there were
calls to the older sym.Symbol "newdie" funtion as opposed to the
loader.Sym based method. This patch converts these to method calls.

Change-Id: I202957464b7c37063ff74e834ed7b76d1dc5bcdf
Reviewed-on: https://go-review.googlesource.com/c/go/+/222757
Reviewed-by: Cherry Zhang <cherryyz@google.com>
src/cmd/link/internal/ld/dwarf.go

index 0d8c2acb9575e28a0353bf5fb012a73a6d907202..b94e55fc2e117433d6b3a60f5f077d2168e7e96a 100644 (file)
@@ -882,7 +882,7 @@ func (d *dwctxt2) synthesizemaptypes(ctxt *Link, die *dwarf.DWDie) {
                                t = d.defptrto(keytype)
                        }
                        d.newrefattr(dwhk, dwarf.DW_AT_type, t)
-                       fld := newdie(ctxt, dwhk, dwarf.DW_ABRV_ARRAYRANGE, "size", 0)
+                       fld := d.newdie(dwhk, dwarf.DW_ABRV_ARRAYRANGE, "size", 0)
                        newattr(fld, dwarf.DW_AT_count, dwarf.DW_CLS_CONSTANT, BucketSize, 0)
                        d.newrefattr(fld, dwarf.DW_AT_type, d.uintptrInfoSym)
                })
@@ -896,7 +896,7 @@ func (d *dwctxt2) synthesizemaptypes(ctxt *Link, die *dwarf.DWDie) {
                                t = d.defptrto(valtype)
                        }
                        d.newrefattr(dwhv, dwarf.DW_AT_type, t)
-                       fld := newdie(ctxt, dwhv, dwarf.DW_ABRV_ARRAYRANGE, "size", 0)
+                       fld := d.newdie(dwhv, dwarf.DW_ABRV_ARRAYRANGE, "size", 0)
                        newattr(fld, dwarf.DW_AT_count, dwarf.DW_CLS_CONSTANT, BucketSize, 0)
                        d.newrefattr(fld, dwarf.DW_AT_type, d.uintptrInfoSym)
                })
@@ -907,17 +907,17 @@ func (d *dwctxt2) synthesizemaptypes(ctxt *Link, die *dwarf.DWDie) {
                        // bucket. "data" will be replaced with keys/values below.
                        d.copychildrenexcept(ctxt, dwhb, bucket, findchild(bucket, "data"))
 
-                       fld := newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "keys", 0)
+                       fld := d.newdie(dwhb, dwarf.DW_ABRV_STRUCTFIELD, "keys", 0)
                        d.newrefattr(fld, dwarf.DW_AT_type, dwhks)
                        newmemberoffsetattr(fld, BucketSize)
-                       fld = newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "values", 0)
+                       fld = d.newdie(dwhb, dwarf.DW_ABRV_STRUCTFIELD, "values", 0)
                        d.newrefattr(fld, dwarf.DW_AT_type, dwhvs)
                        newmemberoffsetattr(fld, BucketSize+BucketSize*int32(keysize))
-                       fld = newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "overflow", 0)
+                       fld = d.newdie(dwhb, dwarf.DW_ABRV_STRUCTFIELD, "overflow", 0)
                        d.newrefattr(fld, dwarf.DW_AT_type, d.defptrto(d.dtolsym(dwhb.Sym)))
                        newmemberoffsetattr(fld, BucketSize+BucketSize*(int32(keysize)+int32(valsize)))
                        if d.arch.RegSize > d.arch.PtrSize {
-                               fld = newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "pad", 0)
+                               fld = d.newdie(dwhb, dwarf.DW_ABRV_STRUCTFIELD, "pad", 0)
                                d.newrefattr(fld, dwarf.DW_AT_type, d.uintptrInfoSym)
                                newmemberoffsetattr(fld, BucketSize+BucketSize*(int32(keysize)+int32(valsize))+int32(d.arch.PtrSize))
                        }