From: Robert Griesemer <gri@golang.org>
Date: Mon, 17 Sep 2018 19:46:33 +0000 (-0700)
Subject: go/types: simplify some internal code
X-Git-Tag: go1.12beta1~1068
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=36531204f4febd614c249e0bbb05cc1a19d3f227;p=gostls13.git

go/types: simplify some internal code

Change-Id: Ia32d40cc272cb049c0a7c9d5f8ef4329bdefc7fe
Reviewed-on: https://go-review.googlesource.com/135699
Run-TryBot: Robert Griesemer <gri@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alan Donovan <adonovan@google.com>
---

diff --git a/src/go/types/decl.go b/src/go/types/decl.go
index e248aab4f5..0ff1fb058b 100644
--- a/src/go/types/decl.go
+++ b/src/go/types/decl.go
@@ -140,20 +140,12 @@ func (check *Checker) objDecl(obj Object, def *Named) {
 		// order code.
 		switch obj := obj.(type) {
 		case *Const:
-			if check.typeCycle(obj) {
-				obj.typ = Typ[Invalid]
-				break
-			}
-			if obj.typ == nil {
+			if check.typeCycle(obj) || obj.typ == nil {
 				obj.typ = Typ[Invalid]
 			}
 
 		case *Var:
-			if check.typeCycle(obj) {
-				obj.typ = Typ[Invalid]
-				break
-			}
-			if obj.typ == nil {
+			if check.typeCycle(obj) || obj.typ == nil {
 				obj.typ = Typ[Invalid]
 			}