diff --git a/src/cmd/vendor/golang.org/x/tools/internal/refactor/inline/inline.go b/src/cmd/vendor/golang.org/x/tools/internal/refactor/inline/inline.go
index cf4c587176e5cd..f23f7300ff1c7d 100644
--- a/src/cmd/vendor/golang.org/x/tools/internal/refactor/inline/inline.go
+++ b/src/cmd/vendor/golang.org/x/tools/internal/refactor/inline/inline.go
@@ -193,6 +193,8 @@ func (st *state) inline() (*Result, error) {
 					logf("keeping block braces: caller uses control labels")
 				} else if intersects(declares(newBlock.List), callerNames) {
 					logf("keeping block braces: avoids name conflict")
+				} else if res.bindingDecl {
+					logf("keeping block braces: avoids potential conflict with other inlinings")
 				} else {
 					elideBraces = true
 				}
@@ -1144,6 +1146,7 @@ func (st *state) inlineCall() (*inlineCallResult, error) {
 		var repl ast.Stmt = body
 		clearPositions(repl)
 		if needBindingDecl {
+			res.bindingDecl = true
 			body.List = prepend(bindingDecl.stmt, body.List...)
 		}
 		res.old = stmt