diff --git a/src/cmd/compile/internal/types2/decl.go b/src/cmd/compile/internal/types2/decl.go
index 5cb52fdbe45..4f9f7c25e74 100644
--- a/src/cmd/compile/internal/types2/decl.go
+++ b/src/cmd/compile/internal/types2/decl.go
@@ -133,11 +133,8 @@ func (check *Checker) objDecl(obj Object, def *TypeName) {
 	check.push(obj)
 	defer check.pop()
 
-	d := check.objMap[obj]
-	if d == nil {
-		check.dump("%v: %s should have been declared", obj.Pos(), obj)
-		panic("unreachable")
-	}
+	d, ok := check.objMap[obj]
+	assert(ok)
 
 	// save/restore current environment and set up object environment
 	defer func(env environment) {
diff --git a/src/go/types/decl.go b/src/go/types/decl.go
index fffcb590e60..1b0aa77ff3b 100644
--- a/src/go/types/decl.go
+++ b/src/go/types/decl.go
@@ -134,11 +134,8 @@ func (check *Checker) objDecl(obj Object, def *TypeName) {
 	check.push(obj) // mark as grey
 	defer check.pop()
 
-	d := check.objMap[obj]
-	if d == nil {
-		check.dump("%v: %s should have been declared", obj.Pos(), obj)
-		panic("unreachable")
-	}
+	d, ok := check.objMap[obj]
+	assert(ok)
 
 	// save/restore current environment and set up object environment
 	defer func(env environment) {