PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround: proc/eval: go sometimes inserts &v instead of v

Browse Source
This commit is contained in:
aarzilli 2016-01-04 16:20:23 +01:00
parent d4bfd25a28
commit 7e0d3fc244
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
proc/eval.go
View File

@ -432,16 +432,23 @@ func (scope *EvalScope) evalIdent(node *ast.Ident) (*Variable, error) {
// try to interpret this as a local variable
v, err := scope.extractVarInfo(node.Name)
if err != nil {
// if it's not a local variable then it could be a package variable w/o explicit package name
origErr := err
_, _, fn := scope.Thread.dbp.PCToLine(scope.PC)
if fn != nil {
if v, err := scope.packageVarAddr(fn.PackageName() + "." + node.Name); err == nil {
v.Name = node.Name
return v, nil
// workaround: sometimes go inserts an entry for '&varname' instead of varname
v, err = scope.extractVarInfo("&" + node.Name)
if err != nil {
// if it's not a local variable then it could be a package variable w/o explicit package name
_, _, fn := scope.Thread.dbp.PCToLine(scope.PC)
if fn != nil {
if v, err := scope.packageVarAddr(fn.PackageName() + "." + node.Name); err == nil {
v.Name = node.Name
return v, nil
}
}
return nil, origErr
} else {
v = v.maybeDereference()
v.Name = node.Name
}
return nil, origErr
}
return v, nil
}

3
service/test/variables_test.go
View File

@ -548,6 +548,9 @@ func TestEvalExpression(t *testing.T) {
{"uint8(i5)", false, "253", "", "uint8", nil},
{"int8(i5)", false, "-3", "", "int8", nil},
{"int8(i6)", false, "12", "", "int8", nil},
// misc
{"i1", true, "1", "", "int", nil},
}
withTestProcess("testvariables3", t, func(p *proc.Process, fixture protest.Fixture) {