From e7b7f874323bf105bebaf92db23fc4ba6f5c5257 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Tue, 14 May 2019 14:46:15 -0700 Subject: [PATCH] cmd/compile: invalidate CFG when fuseIf triggers The compiler appears to have a latent bug: fusePlain calls invalidateCFG when it changes block structure, but fuseIf does not. Fix this by hoisting the call to invalidateCFG to the top level. Change-Id: Ic960fb3ac963b15b4a225aad84863d58efa954e6 Reviewed-on: https://go-review.googlesource.com/c/go/+/177198 Run-TryBot: Josh Bleecher Snyder TryBot-Result: Gobot Gobot Reviewed-by: Keith Randall --- src/cmd/compile/internal/ssa/fuse.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cmd/compile/internal/ssa/fuse.go b/src/cmd/compile/internal/ssa/fuse.go index c451904124..73532ee6e5 100644 --- a/src/cmd/compile/internal/ssa/fuse.go +++ b/src/cmd/compile/internal/ssa/fuse.go @@ -36,6 +36,9 @@ func fuse(f *Func, typ fuseType) { changed = fuseBlockPlain(b) || changed } } + if changed { + f.invalidateCFG() + } } } @@ -207,7 +210,6 @@ func fuseBlockPlain(b *Block) bool { if f.Entry == b { f.Entry = c } - f.invalidateCFG() // trash b, just in case b.Kind = BlockInvalid -- 2.48.1