golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-11-01 20:20:40 +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/eval.go
View File

@ -11,7 +11,7 @@ import (
"go/token"
"reflect"
"github.com/derekparker/delve/dwarf/debug/dwarf"
"golang.org/x/debug/dwarf"
"github.com/derekparker/delve/dwarf/reader"
)
@ -494,7 +494,7 @@ func (scope *EvalScope) evalTypeAssert(node *ast.TypeAssertExpr) (*Variable, err
return nil, err
}
if xv.Children[0].DwarfType.String() != typ.String() {
return nil, fmt.Errorf("interface conversion: %s is %s, not %s", xv.DwarfType.String(), xv.Children[0].TypeString(), typ)
return nil, fmt.Errorf("interface conversion: %s is %s, not %s", xv.DwarfType.Common().Name, xv.Children[0].TypeString(), typ.Common().Name)
}
return &xv.Children[0], nil
}
@ -633,7 +633,7 @@ func (scope *EvalScope) evalAddrOf(node *ast.UnaryExpr) (*Variable, error) {
xev.OnlyAddr = true
typename := "*" + xev.DwarfType.String()
typename := "*" + xev.DwarfType.Common().Name
rv := scope.newVariable("", 0, &dwarf.PtrType{CommonType: dwarf.CommonType{ByteSize: int64(scope.Thread.dbp.arch.PtrSize()), Name: typename}, Type: xev.DwarfType})
rv.Children = []Variable{*xev}
rv.loaded = true
@ -1102,7 +1102,7 @@ func (v *Variable) reslice(low int64, high int64) (*Variable, error) {
ByteSize: 24,
Name: "",
},
StructName: fmt.Sprintf("[]%s", v.fieldType),
StructName: fmt.Sprintf("[]%s", v.fieldType.Common().Name),
Kind: "struct",
Field: nil,
},