cmd/compile: fix inlining labeled switch statements

CL 357649 fixes inlining labeled FOR/RANGE loops, we should do same translation for inlined SWITCH's label Fixes golang#49145 Change-Id: I9a6f365f57e974271a1eb279b38e81f9b5148788 Reviewed-on: https://go-review.googlesource.com/c/go/+/358315 Trust: Cuong Manh Le <[email protected]> Trust: Dan Scales <[email protected]> Run-TryBot: Cuong Manh Le <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Keith Randall <[email protected]> Reviewed-by: Dan Scales <[email protected]>
robertodauria · Oct 25, 2021 · c6e82e5 · c6e82e5
1 parent 2c66cab
commit c6e82e5
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/src/cmd/compile/internal/inline/inl.go b/src/cmd/compile/internal/inline/inl.go
@@ -1285,18 +1285,24 @@ func (subst *inlsubst) node(n ir.Node) ir.Node {
 	ir.EditChildren(m, subst.edit)
 
 	if subst.newclofn == nil {
-		// Translate any label on FOR or RANGE loops
-		if m.Op() == ir.OFOR {
+		// Translate any label on FOR, RANGE loops or SWITCH
+		switch m.Op() {
+		case ir.OFOR:
 			m := m.(*ir.ForStmt)
 			m.Label = translateLabel(m.Label)
 			return m
-		}
 
-		if m.Op() == ir.ORANGE {
+		case ir.ORANGE:
 			m := m.(*ir.RangeStmt)
 			m.Label = translateLabel(m.Label)
 			return m
+
+		case ir.OSWITCH:
+			m := m.(*ir.SwitchStmt)
+			m.Label = translateLabel(m.Label)
+			return m
 		}
+
 	}
 
 	switch m := m.(type) {

diff --git a/test/fixedbugs/issue49145.go b/test/fixedbugs/issue49145.go
@@ -0,0 +1,27 @@
+// run
+
+// Copyright 2021 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
+
+func f(j int) {
+loop:
+	switch j {
+	case 1:
+		break loop
+	default:
+		println(j)
+	}
+}
+
+func main() {
+loop:
+	for j := 0; j < 5; j++ {
+		f(j)
+		if j == 3 {
+			break loop
+		}
+	}
+}
diff --git a/test/fixedbugs/issue49145.out b/test/fixedbugs/issue49145.out
@@ -0,0 +1,3 @@
+0
+2
+3