Skip to content

Commit

Permalink
cmd/compile: allow inlining of ORANGE
Browse files Browse the repository at this point in the history
Updates #14768

Change-Id: I33831f616eae5eeb099033e2b9cf90fa70d6ca86
Reviewed-on: https://go-review.googlesource.com/c/go/+/356869
Run-TryBot: Alberto Donizetti <[email protected]>
TryBot-Result: Go Bot <[email protected]>
Reviewed-by: Dan Scales <[email protected]>
Trust: Dan Scales <[email protected]>
Trust: Alberto Donizetti <[email protected]>
  • Loading branch information
nimelehin authored and danscales committed Oct 28, 2021
1 parent 2ff1074 commit a3bb28e
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/cmd/compile/internal/inline/inl.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,7 @@ func (v *hairyVisitor) doNode(n ir.Node) bool {
return true
}

case ir.ORANGE,
ir.OSELECT,
case ir.OSELECT,
ir.OGO,
ir.ODEFER,
ir.ODCLTYPE, // can't print yet
Expand Down
27 changes: 27 additions & 0 deletions test/fixedbugs/issue49100b.go
Original file line number Diff line number Diff line change
@@ -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 r(j int) {
loop:
for i, c := range "goclang" {
if i == 2 {
continue loop
}
println(string(c))
}
}

func main() {
loop:
for j := 0; j < 4; j++ {
r(j)
if j == 0 {
break loop
}
}
}
6 changes: 6 additions & 0 deletions test/fixedbugs/issue49100b.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
g
o
l
a
n
g
13 changes: 13 additions & 0 deletions test/inline.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,19 @@ func switchType(x interface{}) int { // ERROR "can inline switchType" "x does no
}
}

func inlineRangeIntoMe(data []int) { // ERROR "can inline inlineRangeIntoMe" "data does not escape"
rangeFunc(data, 12) // ERROR "inlining call to rangeFunc"
}

func rangeFunc(xs []int, b int) int { // ERROR "can inline rangeFunc" "xs does not escape"
for i, x := range xs {
if x == b {
return i
}
}
return -1
}

type T struct{}

func (T) meth(int, int) {} // ERROR "can inline T.meth"
Expand Down
2 changes: 1 addition & 1 deletion test/linkname.dir/linkname1.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package x

func indexByte(xs []byte, b byte) int { // ERROR "xs does not escape"
func indexByte(xs []byte, b byte) int { // ERROR "xs does not escape" "can inline indexByte"
for i, x := range xs {
if x == b {
return i
Expand Down

0 comments on commit a3bb28e

Please sign in to comment.