From f751319a0b51b9557a2f7f6000e692769f78da01 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Wed, 29 Jun 2022 17:15:08 -0700 Subject: [PATCH] [dev.unified] test: relax live_regabi.go Unified IR will soon introduce additional temporary variables for multi-valued expressions, which cause this test to start failing. However, according to the comment on lines 594--596, we don't care what temporaries are printed on the noisy lines, just that they're not mentioned on the printnl lines. This CL relaxes the test expectations so that temporaries are allowed to be live at the call to fb38() too, not just the calls to fi38() and fc38(). Change-Id: Ia6c5f28ccf760fd8890a4313fb0d9f0eb9850bba Reviewed-on: https://go-review.googlesource.com/c/go/+/415240 TryBot-Result: Gopher Robot Run-TryBot: Matthew Dempsky Reviewed-by: Cuong Manh Le Reviewed-by: David Chase --- test/live_regabi.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/live_regabi.go b/test/live_regabi.go index aac9a7766c..59be1863fc 100644 --- a/test/live_regabi.go +++ b/test/live_regabi.go @@ -1,4 +1,5 @@ // errorcheckwithauto -0 -l -live -wb=0 -d=ssa/insert_resched_checks/off +//go:build (amd64 && goexperiment.regabiargs) || (arm64 && goexperiment.regabiargs) // +build amd64,goexperiment.regabiargs arm64,goexperiment.regabiargs // Copyright 2014 The Go Authors. All rights reserved. @@ -601,7 +602,7 @@ func f38(b bool) { printnl() case *fi38(2) = <-fc38(): // ERROR "live at call to fc38:( .autotmp_[0-9]+)+$" "live at call to fi38:( .autotmp_[0-9]+)+$" "stack object .autotmp_[0-9]+ string$" printnl() - case *fi38(3), *fb38() = <-fc38(): // ERROR "stack object .autotmp_[0-9]+ string$" "live at call to fc38:( .autotmp_[0-9]+)+$" "live at call to fi38:( .autotmp_[0-9]+)+$" + case *fi38(3), *fb38() = <-fc38(): // ERROR "stack object .autotmp_[0-9]+ string$" "live at call to f[ibc]38:( .autotmp_[0-9]+)+$" printnl() } printnl()