From: hkhere <33268704+hkhere@users.noreply.github.com>
Date: Wed, 20 Oct 2021 17:26:41 +0000 (+0000)
Subject: cmd/compile: use `else if` for mutually exclusive `if` statements
X-Git-Tag: go1.18beta1~816
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=73652af80d9f33de946fc3a91c6900a81247df18;p=gostls13.git

cmd/compile: use `else if` for mutually exclusive `if` statements

Change-Id: I43e5bb778fbba1398c8006b1644524a9885157db
GitHub-Last-Rev: fa76473ab8b207b8cfc350ca8a26de37dfe57f82
GitHub-Pull-Request: golang/go#47155
Reviewed-on: https://go-review.googlesource.com/c/go/+/334169
Trust: Keith Randall <khr@golang.org>
Trust: Robert Griesemer <gri@golang.org>
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
---

diff --git a/src/cmd/compile/internal/typecheck/dcl.go b/src/cmd/compile/internal/typecheck/dcl.go
index 76fc6de621..68ab05a538 100644
--- a/src/cmd/compile/internal/typecheck/dcl.go
+++ b/src/cmd/compile/internal/typecheck/dcl.go
@@ -360,8 +360,7 @@ func funcargs(nt *ir.FuncType) {
 		if n.Sym == nil {
 			// Name so that escape analysis can track it. ~r stands for 'result'.
 			n.Sym = LookupNum("~r", i)
-		}
-		if n.Sym.IsBlank() {
+		} else if n.Sym.IsBlank() {
 			// Give it a name so we can assign to it during return. ~b stands for 'blank'.
 			// The name must be different from ~r above because if you have
 			//	func f() (_ int)