]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.17] cmd/compile: fix prove pass when upper condition is <= maxint
authorKeith Randall <khr@golang.org>
Wed, 29 Jun 2022 20:22:59 +0000 (13:22 -0700)
committerCherry Mui <cherryyz@google.com>
Mon, 25 Jul 2022 23:15:10 +0000 (23:15 +0000)
When the terminating condition is <= X, we need to make sure that
X+step doesn't overflow.

Fixes #53617

Change-Id: I36e5384d05b4d7168e48db6094200fcae409bfe5
Reviewed-on: https://go-review.googlesource.com/c/go/+/415219
Reviewed-by: Than McIntosh <thanm@google.com>
Run-TryBot: David Chase <drchase@google.com>
Reviewed-by: David Chase <drchase@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Keith Randall <khr@golang.org>
(cherry picked from commit 31b8c23c5702f129aca9241bbb2132c90b1929cc)
Reviewed-on: https://go-review.googlesource.com/c/go/+/415415
Reviewed-by: Keith Randall <khr@google.com>
src/cmd/compile/internal/ssa/loopbce.go
test/fixedbugs/issue53600.go [new file with mode: 0644]
test/fixedbugs/issue53600.out [new file with mode: 0644]

index 5a4bc1d60aa5e573ff27f510fe951d4f7468ef6d..fd03efb417db73d916657e1a2f58902e6e3c63c3 100644 (file)
@@ -159,6 +159,13 @@ func findIndVar(f *Func) []indVar {
                        step = -step
                }
 
+               if flags&indVarMaxInc != 0 && max.Op == OpConst64 && max.AuxInt+step < max.AuxInt {
+                       // For a <= comparison, we need to make sure that a value equal to
+                       // max can be incremented without overflowing.
+                       // (For a < comparison, the %step check below ensures no overflow.)
+                       continue
+               }
+
                // Up to now we extracted the induction variable (ind),
                // the increment delta (inc), the temporary sum (nxt),
                // the mininum value (min) and the maximum value (max).
diff --git a/test/fixedbugs/issue53600.go b/test/fixedbugs/issue53600.go
new file mode 100644 (file)
index 0000000..fd3a9e5
--- /dev/null
@@ -0,0 +1,42 @@
+// run
+
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import "math"
+
+func main() {
+       f()
+       g()
+       h()
+}
+func f() {
+       for i := int64(math.MaxInt64); i <= math.MaxInt64; i++ {
+               if i < 0 {
+                       println("done")
+                       return
+               }
+               println(i, i < 0)
+       }
+}
+func g() {
+       for i := int64(math.MaxInt64) - 1; i <= math.MaxInt64; i++ {
+               if i < 0 {
+                       println("done")
+                       return
+               }
+               println(i, i < 0)
+       }
+}
+func h() {
+       for i := int64(math.MaxInt64) - 2; i <= math.MaxInt64; i += 2 {
+               if i < 0 {
+                       println("done")
+                       return
+               }
+               println(i, i < 0)
+       }
+}
diff --git a/test/fixedbugs/issue53600.out b/test/fixedbugs/issue53600.out
new file mode 100644 (file)
index 0000000..5590c7d
--- /dev/null
@@ -0,0 +1,8 @@
+9223372036854775807 false
+done
+9223372036854775806 false
+9223372036854775807 false
+done
+9223372036854775805 false
+9223372036854775807 false
+done