From: Matthew Dempsky <mdempsky@google.com>
Date: Thu, 16 Apr 2020 20:40:24 +0000 (-0700)
Subject: cmd/compile: remove totype0 type-constructor helpers
X-Git-Tag: go1.15beta1~527
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=415da71c5d2b02beab9067af4c2ff435de15bb9b;p=gostls13.git

cmd/compile: remove totype0 type-constructor helpers

These were originally introduced for the binary export format, which
required forward references to arbitrary types and later filling them
in. They're no longer needed since we switched to the indexed export
format, which only requires forward references to declared types.

Passes toolstash-check.

Change-Id: I696dc9029ec7652d01ff49fb98e658a9ed510979
Reviewed-on: https://go-review.googlesource.com/c/go/+/228579
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/compile/internal/gc/dcl.go b/src/cmd/compile/internal/gc/dcl.go
index 54c6a24df5..cd64d9a7bf 100644
--- a/src/cmd/compile/internal/gc/dcl.go
+++ b/src/cmd/compile/internal/gc/dcl.go
@@ -590,14 +590,6 @@ func checkdupfields(what string, fss ...[]*types.Field) {
 // a type for struct/interface/arglist
 func tostruct(l []*Node) *types.Type {
 	t := types.New(TSTRUCT)
-	tostruct0(t, l)
-	return t
-}
-
-func tostruct0(t *types.Type, l []*Node) {
-	if t == nil || !t.IsStruct() {
-		Fatalf("struct expected")
-	}
 
 	fields := make([]*types.Field, len(l))
 	for i, n := range l {
@@ -614,6 +606,8 @@ func tostruct0(t *types.Type, l []*Node) {
 	if !t.Broke() {
 		checkwidth(t)
 	}
+
+	return t
 }
 
 func tofunargs(l []*Node, funarg types.Funarg) *types.Type {
@@ -684,15 +678,6 @@ func tointerface(l []*Node) *types.Type {
 		return types.Types[TINTER]
 	}
 	t := types.New(TINTER)
-	tointerface0(t, l)
-	return t
-}
-
-func tointerface0(t *types.Type, l []*Node) {
-	if t == nil || !t.IsInterface() {
-		Fatalf("interface expected")
-	}
-
 	var fields []*types.Field
 	for _, n := range l {
 		f := interfacefield(n)
@@ -702,6 +687,7 @@ func tointerface0(t *types.Type, l []*Node) {
 		fields = append(fields, f)
 	}
 	t.SetInterface(fields)
+	return t
 }
 
 func fakeRecv() *Node {
@@ -724,14 +710,6 @@ func isifacemethod(f *types.Type) bool {
 // turn a parsed function declaration into a type
 func functype(this *Node, in, out []*Node) *types.Type {
 	t := types.New(TFUNC)
-	functype0(t, this, in, out)
-	return t
-}
-
-func functype0(t *types.Type, this *Node, in, out []*Node) {
-	if t == nil || t.Etype != TFUNC {
-		Fatalf("function type expected")
-	}
 
 	var rcvr []*Node
 	if this != nil {
@@ -748,15 +726,13 @@ func functype0(t *types.Type, this *Node, in, out []*Node) {
 	}
 
 	t.FuncType().Outnamed = t.NumResults() > 0 && origSym(t.Results().Field(0).Sym) != nil
+
+	return t
 }
 
 func functypefield(this *types.Field, in, out []*types.Field) *types.Type {
 	t := types.New(TFUNC)
-	functypefield0(t, this, in, out)
-	return t
-}
 
-func functypefield0(t *types.Type, this *types.Field, in, out []*types.Field) {
 	var rcvr []*types.Field
 	if this != nil {
 		rcvr = []*types.Field{this}
@@ -766,6 +742,8 @@ func functypefield0(t *types.Type, this *types.Field, in, out []*types.Field) {
 	t.FuncType().Results = tofunargsfield(out, types.FunargResults)
 
 	t.FuncType().Outnamed = t.NumResults() > 0 && origSym(t.Results().Field(0).Sym) != nil
+
+	return t
 }
 
 // origSym returns the original symbol written by the user.