[dev.typeparams] all: merge master (fdab5be) into dev.typeparams

[gostls13.git] / src / cmd / compile / internal / typecheck / typecheck.go

diff --git a/src/cmd/compile/internal/typecheck/typecheck.go b/src/cmd/compile/internal/typecheck/typecheck.go
index bf52941b2cfc6143fe45891934cfdfb8b11481ed..8454b8d5b34baf747b965f8c783ae5d776c52bdd 100644 (file)
--- a/src/cmd/compile/internal/typecheck/typecheck.go
+++ b/src/cmd/compile/internal/typecheck/typecheck.go
@@ -787,11 +787,7 @@ func typecheck1(n ir.Node, top int) ir.Node {
 
        case ir.OCLOSURE:
                n := n.(*ir.ClosureExpr)
-               tcClosure(n, top)
-               if n.Type() == nil {
-                       return n
-               }
-               return n
+               return tcClosure(n, top)
 
        case ir.OITAB:
                n := n.(*ir.UnaryExpr)
@@ -1906,11 +1902,6 @@ func typecheckdef(n *ir.Name) {
                                        n.SetDiag(true)
                                        goto ret
                                }
-                               // For package-level type aliases, set n.Sym.Def so we can identify
-                               // it as a type alias during export. See also #31959.
-                               if n.Curfn == nil {
-                                       n.Sym().Def = n.Ntype
-                               }
                        }
                        break
                }