golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-11-03 13:57:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

proc: remove dieToRuntimeType (#3985)

Browse Source 
The dwarfToRuntimeType does basically the same thing in another way and
doesn't have a bug with making unsigned comparisons that should be
signed. It also does more things compared to dieToRuntimeType but it
shouldn't matter since function call injection is very slow anyway.

Fixes an intermittent bug on windows:
	https://delve.teamcity.com/buildConfiguration/Delve_windows_amd64_1_24/67152
This commit is contained in:
Alessandro Arzilli
2025-04-14 18:26:23 +02:00
committed by GitHub
parent 2d9dec034b
commit 2256460b28
3 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/proc/eval.go
View File

@ -1266,7 +1266,7 @@ func (stack *evalStack) executeOp() {
stack.push(newVariable(evalop.BreakpointHitCountVarNameQualified, fakeAddressUnresolv, godwarf.FakeSliceType(godwarf.FakeBasicType("uint", 64)), scope.BinInfo, scope.Mem)) stack.push(newVariable(evalop.BreakpointHitCountVarNameQualified, fakeAddressUnresolv, godwarf.FakeSliceType(godwarf.FakeBasicType("uint", 64)), scope.BinInfo, scope.Mem))
case *evalop.PushRuntimeType: case *evalop.PushRuntimeType:
typeAddr, err := dieToRuntimeType(scope.BinInfo, scope.Mem, op.Type) typeAddr, _, _, err := dwarfToRuntimeType(scope.BinInfo, scope.Mem, op.Type)
if err != nil { if err != nil {
stack.err = err stack.err = err
break break

12
pkg/proc/moduledata.go
View File

@ -77,15 +77,3 @@ func findModuleDataForType(mds []ModuleData, typeAddr uint64) *ModuleData {
} }
return nil return nil
} }
func findModuleDataForImage(mds []ModuleData, so *Image) *ModuleData {
var md *ModuleData
for i := range mds {
if so == nil || mds[i].text > so.StaticBase {
if md == nil || mds[i].text < md.text {
md = &mds[i]
}
}
}
return md
}

19
pkg/proc/types.go
View File

@ -191,22 +191,3 @@ func dwarfToRuntimeType(bi *BinaryInfo, mem MemoryReadWriter, typ godwarf.Type)
typeKind, _ = constant.Uint64Val(kindv.Value) typeKind, _ = constant.Uint64Val(kindv.Value)
return typeAddr, typeKind, true, nil return typeAddr, typeKind, true, nil
} }
func dieToRuntimeType(bi *BinaryInfo, mem MemoryReadWriter, typ godwarf.Type) (uint64, error) {
typc := typ.Common()
so := bi.Images[typc.Index]
mds, err := bi.getModuleData(mem)
if err != nil {
return 0, err
}
md := findModuleDataForImage(mds, so)
if md == nil {
return 0, fmt.Errorf("could not allocate type %s", typ.String())
}
for off, rtdie := range so.runtimeTypeToDIE {
if rtdie.offset == typc.Offset {
return md.types + off, nil
}
}
return 0, fmt.Errorf("could not allocate type %s", typ.String())
}