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

proc: Back to using vendored golang.org/x/debug/ (#585)

Browse Source 
Patch https://go-review.googlesource.com/23085 has been merged so we
can go back to using golang.org/x/debug/.
This commit is contained in:
Alessandro Arzilli
2016-07-05 20:58:11 +02:00
committed by Derek Parker
parent da910cc3bd
commit 372869c9e1
29 changed files with 490 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proc/variables.go
View File

@ -12,7 +12,7 @@ import (
"strings"
"unsafe"
"github.com/derekparker/delve/dwarf/debug/dwarf"
"golang.org/x/debug/dwarf"
"github.com/derekparker/delve/dwarf/op"
"github.com/derekparker/delve/dwarf/reader"
)
@ -282,7 +282,7 @@ func (v *Variable) TypeString() string {
return "nil"
}
if v.DwarfType != nil {
return v.DwarfType.String()
return v.DwarfType.Common().Name
}
return v.Kind.String()
}
@ -626,10 +626,10 @@ func (v *Variable) structMember(memberName string) (*Variable, error) {
// not a regular struct member
for _, field := range t.Field {
isEmbeddedStructMember :=
(field.Type.String() == field.Name) ||
(field.Type.Common().Name == field.Name) ||
(len(field.Name) > 1 &&
field.Name[0] == '*' &&
field.Type.String()[1:] == field.Name[1:])
field.Type.Common().Name[1:] == field.Name[1:])
if !isEmbeddedStructMember {
continue
}