From 255afbfdb76389d5f3f2438834514eeb4259662f Mon Sep 17 00:00:00 2001
From: Oleksandr Redko <Oleksandr_Redko@epam.com>
Date: Tue, 3 Oct 2023 18:50:11 +0300
Subject: [PATCH] all: remove obsolete build tags "// +build" (#3513)

---
 _scripts/gen-cli-docs.go                         | 1 -
 _scripts/gen-opcodes.go                          | 1 -
 _scripts/gen-usage-docs.go                       | 1 -
 pkg/proc/amd64util/xsave_other.go                | 1 -
 pkg/proc/eval_go117.go                           | 1 -
 pkg/proc/eval_go118.go                           | 1 -
 pkg/proc/gdbserial/gdbserver_unix.go             | 1 -
 pkg/proc/internal/ebpf/bpf/dummy.go              | 1 -
 pkg/proc/internal/ebpf/bpf/include/dummy.go      | 1 -
 pkg/proc/internal/ebpf/dummy.go                  | 1 -
 pkg/proc/internal/ebpf/helpers.go                | 1 -
 pkg/proc/internal/ebpf/helpers_disabled.go       | 1 -
 pkg/proc/internal/ebpf/helpers_test.go           | 1 -
 pkg/proc/internal/ebpf/testhelper/testhelper.go  | 1 -
 pkg/proc/macutil/rosetta_other.go                | 1 -
 pkg/proc/native/dump_linux_other.go              | 1 -
 pkg/proc/native/dump_other.go                    | 1 -
 pkg/proc/native/followexec_other.go              | 1 -
 pkg/proc/native/hwbreak_other.go                 | 1 -
 pkg/proc/native/nonative_darwin.go               | 1 -
 pkg/proc/native/proc_darwin.go                   | 1 -
 pkg/proc/native/proc_ebpf_linux.go               | 1 -
 pkg/proc/native/proc_no_ebpf_linux.go            | 1 -
 pkg/proc/native/proc_unix.go                     | 1 -
 pkg/proc/native/ptrace_darwin.go                 | 1 -
 pkg/proc/native/ptrace_linux_64bit.go            | 1 -
 pkg/proc/native/registers_darwin_amd64.go        | 1 -
 pkg/proc/native/support_sentinel.go              | 5 ++---
 pkg/proc/native/support_sentinel_darwin.go       | 5 ++---
 pkg/proc/native/support_sentinel_freebsd.go      | 5 ++---
 pkg/proc/native/support_sentinel_linux.go        | 9 ++-------
 pkg/proc/native/support_sentinel_windows.go      | 7 ++-----
 pkg/proc/native/threads_darwin.go                | 1 -
 pkg/proc/proc_unix_test.go                       | 1 -
 pkg/proc/redirector_other.go                     | 1 -
 pkg/proc/redirector_windows.go                   | 1 -
 pkg/terminal/out_unix.go                         | 1 -
 pkg/terminal/terminal_other.go                   | 1 -
 pkg/version/buildinfo.go                         | 1 -
 pkg/version/fixbuild.go                          | 1 -
 service/debugger/debugger_unix_test.go           | 1 -
 service/internal/sameuser/sameuser.go            | 1 -
 service/internal/sameuser/sameuser_linux.go      | 1 -
 service/internal/sameuser/sameuser_linux_test.go | 1 -
 44 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/_scripts/gen-cli-docs.go b/_scripts/gen-cli-docs.go
index 20246946..ddba4021 100644
--- a/_scripts/gen-cli-docs.go
+++ b/_scripts/gen-cli-docs.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/_scripts/gen-opcodes.go b/_scripts/gen-opcodes.go
index e4fa53b5..8e531b77 100644
--- a/_scripts/gen-opcodes.go
+++ b/_scripts/gen-opcodes.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/_scripts/gen-usage-docs.go b/_scripts/gen-usage-docs.go
index ce226a3a..668c90c7 100644
--- a/_scripts/gen-usage-docs.go
+++ b/_scripts/gen-usage-docs.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/pkg/proc/amd64util/xsave_other.go b/pkg/proc/amd64util/xsave_other.go
index 3905712c..29afbf1f 100644
--- a/pkg/proc/amd64util/xsave_other.go
+++ b/pkg/proc/amd64util/xsave_other.go
@@ -1,5 +1,4 @@
 //go:build !amd64
-// +build !amd64
 
 package amd64util
 
diff --git a/pkg/proc/eval_go117.go b/pkg/proc/eval_go117.go
index b1add2a1..0c728bd4 100644
--- a/pkg/proc/eval_go117.go
+++ b/pkg/proc/eval_go117.go
@@ -1,5 +1,4 @@
 //go:build !go1.18
-// +build !go1.18
 
 package proc
 
diff --git a/pkg/proc/eval_go118.go b/pkg/proc/eval_go118.go
index 0d5c8504..67376a43 100644
--- a/pkg/proc/eval_go118.go
+++ b/pkg/proc/eval_go118.go
@@ -1,5 +1,4 @@
 //go:build go1.18
-// +build go1.18
 
 package proc
 
diff --git a/pkg/proc/gdbserial/gdbserver_unix.go b/pkg/proc/gdbserial/gdbserver_unix.go
index 4ba87ebf..64e35dfb 100644
--- a/pkg/proc/gdbserial/gdbserver_unix.go
+++ b/pkg/proc/gdbserial/gdbserver_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd
-// +build linux darwin freebsd
 
 package gdbserial
 
diff --git a/pkg/proc/internal/ebpf/bpf/dummy.go b/pkg/proc/internal/ebpf/bpf/dummy.go
index 4983aacb..ffd5327e 100644
--- a/pkg/proc/internal/ebpf/bpf/dummy.go
+++ b/pkg/proc/internal/ebpf/bpf/dummy.go
@@ -1,4 +1,3 @@
 //go:build dummy
-// +build dummy
 
 package ebpf
diff --git a/pkg/proc/internal/ebpf/bpf/include/dummy.go b/pkg/proc/internal/ebpf/bpf/include/dummy.go
index 4983aacb..ffd5327e 100644
--- a/pkg/proc/internal/ebpf/bpf/include/dummy.go
+++ b/pkg/proc/internal/ebpf/bpf/include/dummy.go
@@ -1,4 +1,3 @@
 //go:build dummy
-// +build dummy
 
 package ebpf
diff --git a/pkg/proc/internal/ebpf/dummy.go b/pkg/proc/internal/ebpf/dummy.go
index 9ef6e6d3..68070e3d 100644
--- a/pkg/proc/internal/ebpf/dummy.go
+++ b/pkg/proc/internal/ebpf/dummy.go
@@ -1,5 +1,4 @@
 //go:build dummy
-// +build dummy
 
 // This file is part of a workaround for `go mod vendor` which won't
 // vendor C files if there are no Go files in the same directory.
diff --git a/pkg/proc/internal/ebpf/helpers.go b/pkg/proc/internal/ebpf/helpers.go
index 3f4fde40..9c41d80c 100644
--- a/pkg/proc/internal/ebpf/helpers.go
+++ b/pkg/proc/internal/ebpf/helpers.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64 && go1.16
-// +build linux,amd64,go1.16
 
 package ebpf
 
diff --git a/pkg/proc/internal/ebpf/helpers_disabled.go b/pkg/proc/internal/ebpf/helpers_disabled.go
index 66d18c52..8fbaafee 100644
--- a/pkg/proc/internal/ebpf/helpers_disabled.go
+++ b/pkg/proc/internal/ebpf/helpers_disabled.go
@@ -1,5 +1,4 @@
 //go:build !linux || !amd64 || !go1.16
-// +build !linux !amd64 !go1.16
 
 package ebpf
 
diff --git a/pkg/proc/internal/ebpf/helpers_test.go b/pkg/proc/internal/ebpf/helpers_test.go
index 8843ecb3..a22b8773 100644
--- a/pkg/proc/internal/ebpf/helpers_test.go
+++ b/pkg/proc/internal/ebpf/helpers_test.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64 && cgo && go1.16
-// +build linux,amd64,cgo,go1.16
 
 package ebpf
 
diff --git a/pkg/proc/internal/ebpf/testhelper/testhelper.go b/pkg/proc/internal/ebpf/testhelper/testhelper.go
index 3aef49f5..2ac81578 100644
--- a/pkg/proc/internal/ebpf/testhelper/testhelper.go
+++ b/pkg/proc/internal/ebpf/testhelper/testhelper.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64 && cgo && go1.16
-// +build linux,amd64,cgo,go1.16
 
 package testhelper
 
diff --git a/pkg/proc/macutil/rosetta_other.go b/pkg/proc/macutil/rosetta_other.go
index 1dae72fd..e617bd66 100644
--- a/pkg/proc/macutil/rosetta_other.go
+++ b/pkg/proc/macutil/rosetta_other.go
@@ -1,5 +1,4 @@
 //go:build !darwin
-// +build !darwin
 
 package macutil
 
diff --git a/pkg/proc/native/dump_linux_other.go b/pkg/proc/native/dump_linux_other.go
index d74491af..27533aec 100644
--- a/pkg/proc/native/dump_linux_other.go
+++ b/pkg/proc/native/dump_linux_other.go
@@ -1,5 +1,4 @@
 //go:build linux && !amd64
-// +build linux,!amd64
 
 package native
 
diff --git a/pkg/proc/native/dump_other.go b/pkg/proc/native/dump_other.go
index 9422ff29..dbe3b562 100644
--- a/pkg/proc/native/dump_other.go
+++ b/pkg/proc/native/dump_other.go
@@ -1,5 +1,4 @@
 //go:build darwin || (windows && arm64)
-// +build darwin windows,arm64
 
 package native
 
diff --git a/pkg/proc/native/followexec_other.go b/pkg/proc/native/followexec_other.go
index 2520ab0d..dd8efc3a 100644
--- a/pkg/proc/native/followexec_other.go
+++ b/pkg/proc/native/followexec_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package native
 
diff --git a/pkg/proc/native/hwbreak_other.go b/pkg/proc/native/hwbreak_other.go
index a728bca7..e65bf5b8 100644
--- a/pkg/proc/native/hwbreak_other.go
+++ b/pkg/proc/native/hwbreak_other.go
@@ -1,5 +1,4 @@
 //go:build (linux && 386) || (darwin && arm64) || (windows && arm64) || (linux && ppc64le)
-// +build linux,386 darwin,arm64 windows,arm64 linux,ppc64le
 
 package native
 
diff --git a/pkg/proc/native/nonative_darwin.go b/pkg/proc/native/nonative_darwin.go
index f7127154..8fce684a 100644
--- a/pkg/proc/native/nonative_darwin.go
+++ b/pkg/proc/native/nonative_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && !macnative
-// +build darwin,!macnative
 
 package native
 
diff --git a/pkg/proc/native/proc_darwin.go b/pkg/proc/native/proc_darwin.go
index 6304afb3..6483c5f2 100644
--- a/pkg/proc/native/proc_darwin.go
+++ b/pkg/proc/native/proc_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && macnative
-// +build darwin,macnative
 
 package native
 
diff --git a/pkg/proc/native/proc_ebpf_linux.go b/pkg/proc/native/proc_ebpf_linux.go
index 1c65e5ef..0b9bbbb2 100644
--- a/pkg/proc/native/proc_ebpf_linux.go
+++ b/pkg/proc/native/proc_ebpf_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64 && cgo && go1.16
-// +build linux,amd64,cgo,go1.16
 
 package native
 
diff --git a/pkg/proc/native/proc_no_ebpf_linux.go b/pkg/proc/native/proc_no_ebpf_linux.go
index 4b789fa3..8a34c9fd 100644
--- a/pkg/proc/native/proc_no_ebpf_linux.go
+++ b/pkg/proc/native/proc_no_ebpf_linux.go
@@ -1,5 +1,4 @@
 //go:build !linux || !amd64 || !go1.16 || !cgo
-// +build !linux !amd64 !go1.16 !cgo
 
 package native
 
diff --git a/pkg/proc/native/proc_unix.go b/pkg/proc/native/proc_unix.go
index f7a48d54..e1374c64 100644
--- a/pkg/proc/native/proc_unix.go
+++ b/pkg/proc/native/proc_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package native
 
diff --git a/pkg/proc/native/ptrace_darwin.go b/pkg/proc/native/ptrace_darwin.go
index 335b879f..fce34293 100644
--- a/pkg/proc/native/ptrace_darwin.go
+++ b/pkg/proc/native/ptrace_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && macnative
-// +build darwin,macnative
 
 package native
 
diff --git a/pkg/proc/native/ptrace_linux_64bit.go b/pkg/proc/native/ptrace_linux_64bit.go
index ebc0b4c0..01a11704 100644
--- a/pkg/proc/native/ptrace_linux_64bit.go
+++ b/pkg/proc/native/ptrace_linux_64bit.go
@@ -1,5 +1,4 @@
 //go:build (linux && amd64) || (linux && arm64) || (linux && ppc64le)
-// +build linux,amd64 linux,arm64 linux,ppc64le
 
 package native
 
diff --git a/pkg/proc/native/registers_darwin_amd64.go b/pkg/proc/native/registers_darwin_amd64.go
index c8246d7f..fb312ce4 100644
--- a/pkg/proc/native/registers_darwin_amd64.go
+++ b/pkg/proc/native/registers_darwin_amd64.go
@@ -1,5 +1,4 @@
 //go:build darwin && macnative
-// +build darwin,macnative
 
 package native
 
diff --git a/pkg/proc/native/support_sentinel.go b/pkg/proc/native/support_sentinel.go
index b8c7ba3e..ece98162 100644
--- a/pkg/proc/native/support_sentinel.go
+++ b/pkg/proc/native/support_sentinel.go
@@ -1,6 +1,5 @@
+//go:build !linux && !darwin && !windows && !freebsd
+
 // This file is used to detect build on unsupported GOOS/GOARCH combinations.
 
-//go:build !linux && !darwin && !windows && !freebsd
-// +build !linux,!darwin,!windows,!freebsd
-
 package your_operating_system_is_not_supported_by_delve
diff --git a/pkg/proc/native/support_sentinel_darwin.go b/pkg/proc/native/support_sentinel_darwin.go
index 6c829428..82960e70 100644
--- a/pkg/proc/native/support_sentinel_darwin.go
+++ b/pkg/proc/native/support_sentinel_darwin.go
@@ -1,6 +1,5 @@
+//go:build darwin && !amd64 && !arm64
+
 // This file is used to detect build on unsupported GOOS/GOARCH combinations.
 
-//go:build darwin && !amd64 && !arm64
-// +build darwin,!amd64,!arm64
-
 package your_darwin_architectur_is_not_supported_by_delve
diff --git a/pkg/proc/native/support_sentinel_freebsd.go b/pkg/proc/native/support_sentinel_freebsd.go
index f7a1bff9..dcdfe0da 100644
--- a/pkg/proc/native/support_sentinel_freebsd.go
+++ b/pkg/proc/native/support_sentinel_freebsd.go
@@ -1,6 +1,5 @@
+//go:build freebsd && !amd64
+
 // This file is used to detect build on unsupported GOOS/GOARCH combinations.
 
-//go:build freebsd && !amd64
-// +build freebsd,!amd64
-
 package your_freebsd_architecture_is_not_supported_by_delve
diff --git a/pkg/proc/native/support_sentinel_linux.go b/pkg/proc/native/support_sentinel_linux.go
index b13e206e..afb7c0a6 100644
--- a/pkg/proc/native/support_sentinel_linux.go
+++ b/pkg/proc/native/support_sentinel_linux.go
@@ -1,10 +1,5 @@
+//go:build linux && !amd64 && !arm64 && !386 && !(ppc64le && exp.linuxppc64le)
+
 // This file is used to detect build on unsupported GOOS/GOARCH combinations.
 
-//go:build linux && !amd64 && !arm64 && !386 && !(ppc64le && exp.linuxppc64le)
-// +build linux
-// +build !amd64
-// +build !arm64
-// +build !386
-// +build !ppc64le !exp.linuxppc64le
-
 package your_linux_architecture_is_not_supported_by_delve
diff --git a/pkg/proc/native/support_sentinel_windows.go b/pkg/proc/native/support_sentinel_windows.go
index 883c6648..05c758e9 100644
--- a/pkg/proc/native/support_sentinel_windows.go
+++ b/pkg/proc/native/support_sentinel_windows.go
@@ -1,8 +1,5 @@
+//go:build windows && !amd64 && !(arm64 && exp.winarm64)
+
 // This file is used to detect build on unsupported GOOS/GOARCH combinations.
 
-//go:build windows && !amd64 && !(arm64 && exp.winarm64)
-// +build windows
-// +build !amd64
-// +build !arm64 !exp.winarm64
-
 package your_windows_architecture_is_not_supported_by_delve
diff --git a/pkg/proc/native/threads_darwin.go b/pkg/proc/native/threads_darwin.go
index f74277d7..bbdaa5c9 100644
--- a/pkg/proc/native/threads_darwin.go
+++ b/pkg/proc/native/threads_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && macnative
-// +build darwin,macnative
 
 package native
 
diff --git a/pkg/proc/proc_unix_test.go b/pkg/proc/proc_unix_test.go
index 5cc68acb..db3d1094 100644
--- a/pkg/proc/proc_unix_test.go
+++ b/pkg/proc/proc_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package proc_test
 
diff --git a/pkg/proc/redirector_other.go b/pkg/proc/redirector_other.go
index 2203eb71..b07d0a30 100644
--- a/pkg/proc/redirector_other.go
+++ b/pkg/proc/redirector_other.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package proc
 
diff --git a/pkg/proc/redirector_windows.go b/pkg/proc/redirector_windows.go
index edd74a7a..e660afe4 100644
--- a/pkg/proc/redirector_windows.go
+++ b/pkg/proc/redirector_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package proc
 
diff --git a/pkg/terminal/out_unix.go b/pkg/terminal/out_unix.go
index 7b55f632..34350357 100644
--- a/pkg/terminal/out_unix.go
+++ b/pkg/terminal/out_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd
-// +build linux darwin freebsd
 
 package terminal
 
diff --git a/pkg/terminal/terminal_other.go b/pkg/terminal/terminal_other.go
index afdf9a0b..cdad86a8 100644
--- a/pkg/terminal/terminal_other.go
+++ b/pkg/terminal/terminal_other.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package terminal
 
diff --git a/pkg/version/buildinfo.go b/pkg/version/buildinfo.go
index a43a4e6a..4466fbce 100644
--- a/pkg/version/buildinfo.go
+++ b/pkg/version/buildinfo.go
@@ -1,5 +1,4 @@
 //go:build go1.12
-// +build go1.12
 
 package version
 
diff --git a/pkg/version/fixbuild.go b/pkg/version/fixbuild.go
index e2dad6e0..7ddb22b6 100644
--- a/pkg/version/fixbuild.go
+++ b/pkg/version/fixbuild.go
@@ -1,5 +1,4 @@
 //go:build go1.18
-// +build go1.18
 
 package version
 
diff --git a/service/debugger/debugger_unix_test.go b/service/debugger/debugger_unix_test.go
index 12a196bf..df31e160 100644
--- a/service/debugger/debugger_unix_test.go
+++ b/service/debugger/debugger_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package debugger
 
diff --git a/service/internal/sameuser/sameuser.go b/service/internal/sameuser/sameuser.go
index 76d44b07..bd3a8480 100644
--- a/service/internal/sameuser/sameuser.go
+++ b/service/internal/sameuser/sameuser.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package sameuser
 
diff --git a/service/internal/sameuser/sameuser_linux.go b/service/internal/sameuser/sameuser_linux.go
index 8755717c..a666a4f7 100644
--- a/service/internal/sameuser/sameuser_linux.go
+++ b/service/internal/sameuser/sameuser_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package sameuser
 
diff --git a/service/internal/sameuser/sameuser_linux_test.go b/service/internal/sameuser/sameuser_linux_test.go
index 9eb5cb22..5b47b866 100644
--- a/service/internal/sameuser/sameuser_linux_test.go
+++ b/service/internal/sameuser/sameuser_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package sameuser