cmd/compile: remove isStmt symbol from FuncInfo

author Jeremy Faller <jeremy@golang.org>

Thu, 29 Aug 2019 20:35:50 +0000 (16:35 -0400)

committer Jeremy Faller <jeremy@golang.org>

Thu, 26 Sep 2019 15:22:09 +0000 (15:22 +0000)
author Jeremy Faller <jeremy@golang.org>
Thu, 29 Aug 2019 20:35:50 +0000 (16:35 -0400)
committer Jeremy Faller <jeremy@golang.org>
Thu, 26 Sep 2019 15:22:09 +0000 (15:22 +0000)
diff --git a/src/cmd/internal/dwarf/dwarf.go b/src/cmd/internal/dwarf/dwarf.go

index 3feb81a5b4de40dd47cc9234bd2267fa6aba8a1f..740b04f6065b38e8764cbb2b5f5d6d35fa5f7d23 100644 (file)
--- a/src/cmd/internal/dwarf/dwarf.go
+++ b/src/cmd/internal/dwarf/dwarf.go
@@ -27,9 +27,6 @@ const LocPrefix = "go.loc."
  // RangePrefix is the prefix for all the symbols containing DWARF range lists.
  const RangePrefix = "go.range."
  
-// IsStmtPrefix is the prefix for all the symbols containing DWARF is_stmt info for the line number table.
-const IsStmtPrefix = "go.isstmt."
-
  // DebugLinesPrefix is the prefix for all the symbols containing DWARF debug_line information from the compiler.
  const DebugLinesPrefix = "go.debuglines."
  
diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go

index 4beb236bf2c102e3849a08b381801b0ecb42f128..01701efe801a9cddcc4a8e2fcfd9d1bfd6baae69 100644 (file)
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@ -406,7 +406,6 @@ type FuncInfo struct {
         dwarfLocSym        *LSym
         dwarfRangesSym     *LSym
         dwarfAbsFnSym      *LSym
-       dwarfIsStmtSym     *LSym
         dwarfDebugLinesSym *LSym
  
         GCArgs       *LSym
diff --git a/src/cmd/internal/obj/objfile.go b/src/cmd/internal/obj/objfile.go

index a40c6d8c29dd92c278deeb3594d4ecf4e50af9c8..dbbcd1240b502f42f3149334c08dfbd823e085e6 100644 (file)
--- a/src/cmd/internal/obj/objfile.go
+++ b/src/cmd/internal/obj/objfile.go
@@ -551,7 +551,7 @@ func isDwarf64(ctxt *Link) bool {
         return ctxt.Headtype == objabi.Haix
  }
  
-func (ctxt *Link) dwarfSym(s *LSym) (dwarfInfoSym, dwarfLocSym, dwarfRangesSym, dwarfAbsFnSym, dwarfIsStmtSym, dwarfDebugLines *LSym) {
+func (ctxt *Link) dwarfSym(s *LSym) (dwarfInfoSym, dwarfLocSym, dwarfRangesSym, dwarfAbsFnSym, dwarfDebugLines *LSym) {
         if s.Type != objabi.STEXT {
                 ctxt.Diag("dwarfSym of non-TEXT %v", s)
         }
@@ -564,10 +564,9 @@ func (ctxt *Link) dwarfSym(s *LSym) (dwarfInfoSym, dwarfLocSym, dwarfRangesSym,
                 if s.WasInlined() {
                         s.Func.dwarfAbsFnSym = ctxt.DwFixups.AbsFuncDwarfSym(s)
                 }
-               s.Func.dwarfIsStmtSym = ctxt.LookupDerived(s, dwarf.IsStmtPrefix+s.Name)
                 s.Func.dwarfDebugLinesSym = ctxt.LookupDerived(s, dwarf.DebugLinesPrefix+s.Name)
         }
-       return s.Func.dwarfInfoSym, s.Func.dwarfLocSym, s.Func.dwarfRangesSym, s.Func.dwarfAbsFnSym, s.Func.dwarfIsStmtSym, s.Func.dwarfDebugLinesSym
+       return s.Func.dwarfInfoSym, s.Func.dwarfLocSym, s.Func.dwarfRangesSym, s.Func.dwarfAbsFnSym, s.Func.dwarfDebugLinesSym
  }
  
  func (s *LSym) Len() int64 {
@@ -591,14 +590,13 @@ func (ctxt *Link) fileSymbol(fn *LSym) *LSym {
  // TEXT symbol 's'. The various DWARF symbols must already have been
  // initialized in InitTextSym.
  func (ctxt *Link) populateDWARF(curfn interface{}, s *LSym, myimportpath string) {
-       info, loc, ranges, absfunc, _, lines := ctxt.dwarfSym(s)
+       info, loc, ranges, absfunc, lines := ctxt.dwarfSym(s)
         if info.Size != 0 {
                 ctxt.Diag("makeFuncDebugEntry double process %v", s)
         }
         var scopes []dwarf.Scope
         var inlcalls dwarf.InlCalls
         if ctxt.DebugInfo != nil {
-               stmtData(ctxt, s)
                 scopes, inlcalls = ctxt.DebugInfo(s, curfn)
         }
         var err error
diff --git a/src/cmd/internal/obj/pcln.go b/src/cmd/internal/obj/pcln.go

index 26cbe9fe049ddc81adfa4306d4d6cc5313a8e473..ca1eda8d1ecfbeb5cf6de7e90a396173b3652398 100644 (file)
--- a/src/cmd/internal/obj/pcln.go
+++ b/src/cmd/internal/obj/pcln.go
@@ -295,13 +295,6 @@ func pctopcdata(ctxt *Link, sym *LSym, oldval int32, p *Prog, phase int32, arg i
         return int32(p.To.Offset)
  }
  
-// stmtData writes out pc-linked is_stmt data for eventual use in the DWARF line numbering table.
-func stmtData(ctxt *Link, cursym *LSym) {
-       var pctostmtData Pcdata
-       funcpctab(ctxt, &pctostmtData, cursym, "pctostmt", pctostmt, nil)
-       cursym.Func.dwarfIsStmtSym.P = pctostmtData.P
-}
-
  func linkpcln(ctxt *Link, cursym *LSym) {
         pcln := &cursym.Func.Pcln
  
diff --git a/src/cmd/internal/obj/plist.go b/src/cmd/internal/obj/plist.go

index 7ecf96e7fa855638bf0492c948baaed5d22974fd..d41364996dfcac5f4b338d454e551efd36d0b7db 100644 (file)
--- a/src/cmd/internal/obj/plist.go
+++ b/src/cmd/internal/obj/plist.go
@@ -137,7 +137,7 @@ func (ctxt *Link) InitTextSym(s *LSym, flag int) {
         ctxt.Text = append(ctxt.Text, s)
  
         // Set up DWARF entries for s.
-       info, loc, ranges, _, isstmt, lines := ctxt.dwarfSym(s)
+       info, loc, ranges, _, lines := ctxt.dwarfSym(s)
         info.Type = objabi.SDWARFINFO
         info.Set(AttrDuplicateOK, s.DuplicateOK())
         if loc != nil {
@@ -148,9 +148,6 @@ func (ctxt *Link) InitTextSym(s *LSym, flag int) {
         ranges.Type = objabi.SDWARFRANGE
         ranges.Set(AttrDuplicateOK, s.DuplicateOK())
         ctxt.Data = append(ctxt.Data, info, ranges)
-       isstmt.Type = objabi.SDWARFMISC
-       isstmt.Set(AttrDuplicateOK, s.DuplicateOK())
-       ctxt.Data = append(ctxt.Data, isstmt)
         lines.Type = objabi.SDWARFLINES
         lines.Set(AttrDuplicateOK, s.DuplicateOK())
         ctxt.Data = append(ctxt.Data, lines)
diff --git a/src/cmd/internal/objabi/symkind.go b/src/cmd/internal/objabi/symkind.go

index 7549163c6c62640024cb406fea9041ff717e7ae7..f709c367cafdc87fd537cc0c28dfb5bb28af389e 100644 (file)
--- a/src/cmd/internal/objabi/symkind.go
+++ b/src/cmd/internal/objabi/symkind.go
@@ -60,7 +60,6 @@ const (
         SDWARFRANGE
         SDWARFLOC
         SDWARFLINES
-       SDWARFMISC
         // ABI alias. An ABI alias symbol is an empty symbol with a
         // single relocation with 0 size that references the native
         // function implementation symbol.
diff --git a/src/cmd/link/internal/sym/symkind.go b/src/cmd/link/internal/sym/symkind.go

index a3efced6489f4dc05c3bf1817a63f9fcbb45a010..4e44d3fce106a19b5bb91ad4f492d36b2f5e711e 100644 (file)
--- a/src/cmd/link/internal/sym/symkind.go
+++ b/src/cmd/link/internal/sym/symkind.go
@@ -111,7 +111,6 @@ const (
         SDWARFRANGE
         SDWARFLOC
         SDWARFLINES
-       SDWARFMISC // Not really a section; informs/affects other DWARF section generation
  
         // ABI aliases (these never appear in the output)
         SABIALIAS
@@ -132,7 +131,6 @@ var AbiSymKindToSymKind = [...]SymKind{
         SDWARFRANGE,
         SDWARFLOC,
         SDWARFLINES,
-       SDWARFMISC,
         SABIALIAS,
  }
  
diff --git a/src/cmd/link/internal/sym/symkind_string.go b/src/cmd/link/internal/sym/symkind_string.go

index 9349ff6af539807a65cdaab5e6487c859dcb7175..2732ec7654fb4f72a021809f67c642db213c7bdb 100644 (file)
--- a/src/cmd/link/internal/sym/symkind_string.go
+++ b/src/cmd/link/internal/sym/symkind_string.go
@@ -59,13 +59,12 @@ func _() {
         _ = x[SDWARFRANGE-48]
         _ = x[SDWARFLOC-49]
         _ = x[SDWARFLINES-50]
-       _ = x[SDWARFMISC-51]
-       _ = x[SABIALIAS-52]
+       _ = x[SABIALIAS-51]
  }
  
-const _SymKind_name = "SxxxSTEXTSELFRXSECTSTYPESSTRINGSGOSTRINGSGOFUNCSGCBITSSRODATASFUNCTABSELFROSECTSMACHOPLTSTYPERELROSSTRINGRELROSGOSTRINGRELROSGOFUNCRELROSGCBITSRELROSRODATARELROSFUNCTABRELROSTYPELINKSITABLINKSSYMTABSPCLNTABSFirstWritableSBUILDINFOSELFSECTSMACHOSMACHOGOTSWINDOWSSELFGOTSNOPTRDATASINITARRSDATASXCOFFTOCSBSSSNOPTRBSSSTLSBSSSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSFILEPATHSCONSTSDYNIMPORTSHOSTOBJSDWARFSECTSDWARFINFOSDWARFRANGESDWARFLOCSDWARFLINESSDWARFMISCSABIALIAS"
+const _SymKind_name = "SxxxSTEXTSELFRXSECTSTYPESSTRINGSGOSTRINGSGOFUNCSGCBITSSRODATASFUNCTABSELFROSECTSMACHOPLTSTYPERELROSSTRINGRELROSGOSTRINGRELROSGOFUNCRELROSGCBITSRELROSRODATARELROSFUNCTABRELROSTYPELINKSITABLINKSSYMTABSPCLNTABSFirstWritableSBUILDINFOSELFSECTSMACHOSMACHOGOTSWINDOWSSELFGOTSNOPTRDATASINITARRSDATASXCOFFTOCSBSSSNOPTRBSSSTLSBSSSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSFILEPATHSCONSTSDYNIMPORTSHOSTOBJSDWARFSECTSDWARFINFOSDWARFRANGESDWARFLOCSDWARFLINESSABIALIAS"
  
-var _SymKind_index = [...]uint16{0, 4, 9, 19, 24, 31, 40, 47, 54, 61, 69, 79, 88, 98, 110, 124, 136, 148, 160, 173, 182, 191, 198, 206, 220, 230, 238, 244, 253, 261, 268, 278, 286, 291, 300, 304, 313, 320, 325, 337, 349, 366, 383, 392, 398, 408, 416, 426, 436, 447, 456, 467, 477, 486}
+var _SymKind_index = [...]uint16{0, 4, 9, 19, 24, 31, 40, 47, 54, 61, 69, 79, 88, 98, 110, 124, 136, 148, 160, 173, 182, 191, 198, 206, 220, 230, 238, 244, 253, 261, 268, 278, 286, 291, 300, 304, 313, 320, 325, 337, 349, 366, 383, 392, 398, 408, 416, 426, 436, 447, 456, 467, 476}
  
  func (i SymKind) String() string {
         if i >= SymKind(len(_SymKind_index)-1) {
author	Jeremy Faller <jeremy@golang.org>
	Thu, 29 Aug 2019 20:35:50 +0000 (16:35 -0400)
committer	Jeremy Faller <jeremy@golang.org>
	Thu, 26 Sep 2019 15:22:09 +0000 (15:22 +0000)
src/cmd/internal/dwarf/dwarf.go		patch \| blob \| history
src/cmd/internal/obj/link.go		patch \| blob \| history
src/cmd/internal/obj/objfile.go		patch \| blob \| history
src/cmd/internal/obj/pcln.go		patch \| blob \| history
src/cmd/internal/obj/plist.go		patch \| blob \| history
src/cmd/internal/objabi/symkind.go		patch \| blob \| history
src/cmd/link/internal/sym/symkind.go		patch \| blob \| history
src/cmd/link/internal/sym/symkind_string.go		patch \| blob \| history