From 6436f5c13d6a5ced6cd5f3873f83ebfae32cce36 Mon Sep 17 00:00:00 2001 From: Cherry Mui Date: Thu, 7 Oct 2021 16:26:29 -0400 Subject: [PATCH] runtime: handle end PC in textAddr As the func table contains the end marker of the text section, we sometimes need to get that address from an offset. Currently textAddr doesn't handle that address, as it is not within any text section. Instead of letting the callers not call textAddr with the end offset, just handle it more elegantly in textAddr. For #48837. Change-Id: I6e97e455f6cb66e9680a7aac6152ba6f4cda2e12 Reviewed-on: https://go-review.googlesource.com/c/go/+/354635 Trust: Cherry Mui Trust: Josh Bleecher Snyder Run-TryBot: Cherry Mui Reviewed-by: Josh Bleecher Snyder --- src/runtime/symtab.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go index 2de518d2e6..e35d8047a1 100644 --- a/src/runtime/symtab.go +++ b/src/runtime/symtab.go @@ -623,9 +623,7 @@ func moduledataverify1(datap *moduledata) { } min := datap.textAddr(datap.ftab[0].entryoff) - // The max PC is outside of the text section. - // Subtract 1 to get a PC inside the text section, look it up, then add 1 back in. - max := datap.textAddr(datap.ftab[nftab].entryoff-1) + 1 + max := datap.textAddr(datap.ftab[nftab].entryoff) if datap.minpc != min || datap.maxpc != max { println("minpc=", hex(datap.minpc), "min=", hex(min), "maxpc=", hex(datap.maxpc), "max=", hex(max)) throw("minpc or maxpc invalid") @@ -660,9 +658,10 @@ func (md *moduledata) textAddr(off32 uint32) uintptr { off := uintptr(off32) res := md.text + off if len(md.textsectmap) > 1 { - for i := range md.textsectmap { - if off >= md.textsectmap[i].vaddr && off < md.textsectmap[i].end { - res = md.textsectmap[i].baseaddr + off - md.textsectmap[i].vaddr + for i, sect := range md.textsectmap { + // For the last section, include the end address (etext), as it is included in the functab. + if off >= sect.vaddr && off < sect.end || (i == len(md.textsectmap)-1 && off == sect.end) { + res = sect.baseaddr + off - sect.vaddr break } } -- 2.50.0