]> Cypherpunks.ru repositories - gostls13.git/commitdiff
[dev.link] all: merge branch 'master' into dev.link
authorCherry Zhang <cherryyz@google.com>
Thu, 30 Apr 2020 16:32:09 +0000 (12:32 -0400)
committerCherry Zhang <cherryyz@google.com>
Thu, 30 Apr 2020 16:32:09 +0000 (12:32 -0400)
Clean merge.

Change-Id: I9a30645ca0ceb52e45bc6b301f9f15f2f42998e8

1  2 
src/cmd/internal/obj/link.go

index e78e4a0bebd8a34059adcdd9e1a45f14edfb5ca6,65e58887e67ab806f34583dc5c30c9ba36f4a690..32906a3e05ab5595e2093e0e931c5124453bb16c
@@@ -33,7 -33,6 +33,7 @@@ package ob
  import (
        "bufio"
        "cmd/internal/dwarf"
 +      "cmd/internal/goobj2"
        "cmd/internal/objabi"
        "cmd/internal/src"
        "cmd/internal/sys"
@@@ -413,7 -412,7 +413,7 @@@ type FuncInfo struct 
  
        GCArgs             *LSym
        GCLocals           *LSym
-       GCRegs             *LSym
+       GCRegs             *LSym // Only if !go115ReduceLiveness
        StackObjects       *LSym
        OpenCodedDeferInfo *LSym
  
@@@ -667,7 -666,7 +667,7 @@@ type Link struct 
        PosTable           src.PosTable
        InlTree            InlTree // global inlining tree used by gc/inl.go
        DwFixups           *DwarfFixupTable
 -      Imports            []string
 +      Imports            []goobj2.ImportedPkg
        DiagFunc           func(string, ...interface{})
        DiagFlush          func()
        DebugInfo          func(fn *LSym, info *LSym, curfn interface{}) ([]dwarf.Scope, dwarf.InlCalls) // if non-nil, curfn is a *gc.Node
        defs       []*LSym // list of defined symbols in the current package
        nonpkgdefs []*LSym // list of defined non-package symbols
        nonpkgrefs []*LSym // list of referenced non-package symbols
 +
 +      Fingerprint goobj2.FingerprintType // fingerprint of symbol indices, to catch index mismatch
  }
  
  func (ctxt *Link) Diag(format string, args ...interface{}) {