From 29fcd1569af7025dc0730449ddc7912e8c4791da Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Fri, 29 Mar 2024 21:31:56 +0000 Subject: [PATCH] Revert "cmd/compile: add missing OINLCAll case in mayModifyPkgVar" This reverts CL 575175. Reason for revert: causes crypto/ecdh failures on longtest builders. Change-Id: Ieed326fedf91760ac73095a42ba0237cf969843b Reviewed-on: https://go-review.googlesource.com/c/go/+/575316 LUCI-TryBot-Result: Go LUCI Reviewed-by: Than McIntosh Reviewed-by: David Chase Auto-Submit: Than McIntosh --- src/cmd/compile/internal/staticinit/sched.go | 3 --- test/fixedbugs/issue66585.go | 25 -------------------- 2 files changed, 28 deletions(-) delete mode 100644 test/fixedbugs/issue66585.go diff --git a/src/cmd/compile/internal/staticinit/sched.go b/src/cmd/compile/internal/staticinit/sched.go index 6221f79625..4191f6997e 100644 --- a/src/cmd/compile/internal/staticinit/sched.go +++ b/src/cmd/compile/internal/staticinit/sched.go @@ -890,9 +890,6 @@ func mayModifyPkgVar(n ir.Node) bool { case ir.OCALLFUNC, ir.OCALLINTER: return !ir.IsFuncPCIntrinsic(n.(*ir.CallExpr)) - case ir.OINLCALL: - return true - case ir.OAPPEND, ir.OCLEAR, ir.OCOPY: return true // could mutate a global array diff --git a/test/fixedbugs/issue66585.go b/test/fixedbugs/issue66585.go deleted file mode 100644 index fdadf59d63..0000000000 --- a/test/fixedbugs/issue66585.go +++ /dev/null @@ -1,25 +0,0 @@ -// run - -// Copyright 2024 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 - -var x = 0 -var a = foo() -var b = x - -func foo() int { - x++ - return x -} - -func main() { - if a != 1 { - panic("unexpected a value") - } - if b != 1 { - panic("unexpected b value") - } -}