|
 |
aed8ff |
diff --git a/pkg/goversion/go_version.go b/pkg/goversion/go_version.go
|
|
|
aed8ff |
index 5caf1b9bb..88a2d4e5c 100644
|
|
|
aed8ff |
--- a/pkg/goversion/go_version.go
|
|
|
aed8ff |
+++ b/pkg/goversion/go_version.go
|
|
|
aed8ff |
@@ -155,11 +155,18 @@ func Installed() (GoVersion, bool) {
|
|
|
aed8ff |
// or go version) is major.minor or a later version, or a development
|
|
|
aed8ff |
// version.
|
|
|
aed8ff |
func VersionAfterOrEqual(version string, major, minor int) bool {
|
|
|
aed8ff |
+ return VersionAfterOrEqualRev(version, major, minor, -1)
|
|
|
aed8ff |
+}
|
|
|
aed8ff |
+
|
|
|
aed8ff |
+// VersionAfterOrEqualRev checks that version (as returned by runtime.Version()
|
|
|
aed8ff |
+// or go version) is major.minor or a later version, or a development
|
|
|
aed8ff |
+// version.
|
|
|
aed8ff |
+func VersionAfterOrEqualRev(version string, major, minor, rev int) bool {
|
|
|
aed8ff |
ver, _ := Parse(version)
|
|
|
aed8ff |
if ver.IsDevel() {
|
|
|
aed8ff |
return true
|
|
|
aed8ff |
}
|
|
|
aed8ff |
- return ver.AfterOrEqual(GoVersion{major, minor, -1, 0, 0, ""})
|
|
|
aed8ff |
+ return ver.AfterOrEqual(GoVersion{major, minor, rev, 0, 0, ""})
|
|
|
aed8ff |
}
|
|
|
aed8ff |
|
|
|
aed8ff |
const producerVersionPrefix = "Go cmd/compile "
|
|
|
aed8ff |
diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
|
|
|
aed8ff |
index f33ddac37..92e6e38db 100644
|
|
|
aed8ff |
--- a/pkg/proc/proc_test.go
|
|
|
aed8ff |
+++ b/pkg/proc/proc_test.go
|
|
|
aed8ff |
@@ -4804,7 +4804,8 @@ func TestStepIntoWrapperForEmbeddedPointer(t *testing.T) {
|
|
|
aed8ff |
{contStepout, 29}})
|
|
|
aed8ff |
|
|
|
aed8ff |
// same test but with next instead of stepout
|
|
|
aed8ff |
- if goversion.VersionAfterOrEqual(runtime.Version(), 1, 14) && runtime.GOARCH != "386" {
|
|
|
aed8ff |
+ if goversion.VersionAfterOrEqual(runtime.Version(), 1, 14) && runtime.GOARCH != "386" && !goversion.VersionAfterOrEqualRev(runtime.Version(), 1, 15, 4) {
|
|
|
aed8ff |
+ // Line numbers generated for versions 1.14 through 1.15.3 on any system except linux/386
|
|
|
aed8ff |
testseq2(t, "ifaceembcall", "", []seqTest{
|
|
|
aed8ff |
{contContinue, 28}, // main.main, the line calling iface.PtrReceiver()
|
|
|
aed8ff |
{contStep, 18}, // main.(*A).PtrReceiver
|