From 36531204f4febd614c249e0bbb05cc1a19d3f227 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Mon, 17 Sep 2018 12:46:33 -0700 Subject: [PATCH] go/types: simplify some internal code Change-Id: Ia32d40cc272cb049c0a7c9d5f8ef4329bdefc7fe Reviewed-on: https://go-review.googlesource.com/135699 Run-TryBot: Robert Griesemer TryBot-Result: Gobot Gobot Reviewed-by: Alan Donovan --- src/go/types/decl.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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] } -- 2.50.0