From 84ce27835219a0a1e4d300dc7c72c78072bd473e Mon Sep 17 00:00:00 2001
From: aarzilli <alessandro.arzilli@gmail.com>
Date: Sat, 17 Mar 2018 11:14:34 +0100
Subject: [PATCH] proc: allow evaluating constants specified with a partial
 package path

Fixes #1151
---
 _fixtures/consts.go               | 4 +++-
 _fixtures/vendor/dir0/pkg/main.go | 4 ++++
 pkg/proc/variables.go             | 2 +-
 service/test/variables_test.go    | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/_fixtures/consts.go b/_fixtures/consts.go
index 9163b6a7..531a27db 100644
--- a/_fixtures/consts.go
+++ b/_fixtures/consts.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"dir0/pkg"
 	"fmt"
 	"runtime"
 )
@@ -32,5 +33,6 @@ func main() {
 	e := ConstType(10)
 	f := BitFieldType(0)
 	runtime.Breakpoint()
-	fmt.Println(a, b, c, d, e, f)
+	pkg.SomeVar.AnotherMethod(2)
+	fmt.Println(a, b, c, d, e, f, pkg.SomeConst)
 }
diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/vendor/dir0/pkg/main.go
index 4c9fbde8..bb0d895b 100644
--- a/_fixtures/vendor/dir0/pkg/main.go
+++ b/_fixtures/vendor/dir0/pkg/main.go
@@ -13,3 +13,7 @@ func (s *SomeType) AnotherMethod(x int) int {
 }
 
 var SomeVar SomeType
+
+const (
+	SomeConst int = 2
+)
diff --git a/pkg/proc/variables.go b/pkg/proc/variables.go
index cdcda3a6..0a2f67d0 100644
--- a/pkg/proc/variables.go
+++ b/pkg/proc/variables.go
@@ -666,7 +666,7 @@ func (scope *EvalScope) findGlobal(name string) (*Variable, error) {
 	}
 	for offset, ctyp := range scope.BinInfo.consts {
 		for _, cval := range ctyp.values {
-			if cval.fullName == name {
+			if cval.fullName == name || strings.HasSuffix(cval.fullName, "/"+name) {
 				t, err := scope.Type(offset)
 				if err != nil {
 					return nil, err
diff --git a/service/test/variables_test.go b/service/test/variables_test.go
index 92a4e137..1c826acf 100644
--- a/service/test/variables_test.go
+++ b/service/test/variables_test.go
@@ -960,6 +960,7 @@ func TestConstants(t *testing.T) {
 		{"bitZero", true, "1", "", "main.BitFieldType", nil},
 		{"bitOne", true, "2", "", "main.BitFieldType", nil},
 		{"constTwo", true, "2", "", "main.ConstType", nil},
+		{"pkg.SomeConst", true, "2", "", "int", nil},
 	}
 	ver, _ := goversion.Parse(runtime.Version())
 	if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 10, -1, 0, 0, ""}) {
-- 
GitLab