diff --git a/src/cmd/compile/internal/ssa/testdata/infloop.dlv-opt.nexts b/src/cmd/compile/internal/ssa/testdata/infloop.dlv-opt.nexts
index 19496de660..0b9f06f85d 100644
--- a/src/cmd/compile/internal/ssa/testdata/infloop.dlv-opt.nexts
+++ b/src/cmd/compile/internal/ssa/testdata/infloop.dlv-opt.nexts
@@ -2,11 +2,11 @@
 6:	func test() {
 8:		go func() {}()
 10:		for {
-1048575:
+1:	package main
 10:		for {
-1048575:
+1:	package main
 10:		for {
-1048575:
+1:	package main
 10:		for {
-1048575:
+1:	package main
 10:		for {
diff --git a/src/cmd/internal/src/pos.go b/src/cmd/internal/src/pos.go
index 60c7c91cde..861d9188b1 100644
--- a/src/cmd/internal/src/pos.go
+++ b/src/cmd/internal/src/pos.go
@@ -305,7 +305,7 @@ type lico uint32
 // because they have almost no interaction with other uses of the position.
 const (
 	lineBits, lineMax     = 20, 1<<lineBits - 2
-	bogusLine             = 1<<lineBits - 1 // Not a line number; used to disrupt infinite loops
+	bogusLine             = 1 // Used to disrupt infinite loops to prevent debugger looping
 	isStmtBits, isStmtMax = 2, 1<<isStmtBits - 1
 	xlogueBits, xlogueMax = 2, 1<<xlogueBits - 1
 	colBits, colMax       = 32 - lineBits - xlogueBits - isStmtBits, 1<<colBits - 1
diff --git a/src/cmd/objdump/testdata/fmthello.go b/src/cmd/objdump/testdata/fmthello.go
index e98268199d..fd16ebee1b 100644
--- a/src/cmd/objdump/testdata/fmthello.go
+++ b/src/cmd/objdump/testdata/fmthello.go
@@ -4,9 +4,15 @@ import "fmt"
 
 func main() {
 	Println("hello, world")
+	if flag {
+		for {
+		}
+	}
 }
 
 //go:noinline
 func Println(s string) {
 	fmt.Println(s)
 }
+
+var flag bool