Don't repeat parts of extractType that populate tracking tables

Author: smowton

go/extractor/extractor.go

@@ -1546,15 +1546,20 @@ func extractTypeWithFlags(tw *trap.Writer, tp types.Type, transparentAliases boo
 			for i := 0; i < tp.NumFields(); i++ {
 				field := tp.Field(i)
 
-				// ensure the field is associated with a label - note that
-				// struct fields do not have a parent scope, so they are not
-				// dealt with by `extractScopes`
-				fieldlbl, exists := tw.Labeler.FieldID(field, i, lbl)
-				if !exists {
-					extractObject(tw, field, fieldlbl)
-				}
+				if !transparentAliases {
+					// ensure the field is associated with a label - note that
+					// struct fields do not have a parent scope, so they are not
+					// dealt with by `extractScopes`.
+
+					// Skip this when extracting a type with transparent aliases;
+					// this is not the definitive version of the type.
+					fieldlbl, exists := tw.Labeler.FieldID(field, i, lbl)
+					if !exists {
+						extractObject(tw, field, fieldlbl)
+					}
 
-				dbscheme.FieldStructsTable.Emit(tw, fieldlbl, lbl)
+					dbscheme.FieldStructsTable.Emit(tw, fieldlbl, lbl)
+				}
 
 				name := field.Name()
 				if field.Embedded() {
@@ -1571,9 +1576,14 @@ func extractTypeWithFlags(tw *trap.Writer, tp types.Type, transparentAliases boo
 			for i := 0; i < tp.NumMethods(); i++ {
 				meth := tp.Method(i)
 
-				// Note that methods do not have a parent scope, so they are
-				// not dealt with by `extractScopes`
-				extractMethod(tw, meth)
+				if !transparentAliases {
+					// Note that methods do not have a parent scope, so they are
+					// not dealt with by `extractScopes`
+
+					// Skip this when extracting a type with transparent aliases;
+					// this is not the definitive version of the type.
+					extractMethod(tw, meth)
+				}
 
 				extractComponentType(tw, lbl, i, meth.Name(), meth.Type(), transparentAliases)
 			}
@@ -1620,23 +1630,30 @@ func extractTypeWithFlags(tw *trap.Writer, tp types.Type, transparentAliases boo
 			dbscheme.TypeNameTable.Emit(tw, lbl, origintp.Obj().Name())
 			underlying := origintp.Underlying()
 			extractUnderlyingType(tw, lbl, underlying)
-			trackInstantiatedStructFields(tw, tp, origintp)
 
-			extractTypeObject(tw, lbl, origintp.Obj())
+			if !transparentAliases {
+				// The transparent and non-transparent versions of a named typed
+				// should be equal, so this is probably harmless, but regardless
+				// don't repeat it to save time.
 
-			// ensure all methods have labels - note that methods do not have a
-			// parent scope, so they are not dealt with by `extractScopes`
-			for i := 0; i < origintp.NumMethods(); i++ {
-				meth := origintp.Method(i)
+				trackInstantiatedStructFields(tw, tp, origintp)
 
-				extractMethod(tw, meth)
-			}
+				extractTypeObject(tw, lbl, origintp.Obj())
+
+				// ensure all methods have labels - note that methods do not have a
+				// parent scope, so they are not dealt with by `extractScopes`
+				for i := 0; i < origintp.NumMethods(); i++ {
+					meth := origintp.Method(i)
 
-			// associate all methods of underlying interface with this type
-			if underlyingInterface, ok := underlying.(*types.Interface); ok {
-				for i := 0; i < underlyingInterface.NumMethods(); i++ {
-					methlbl := extractMethod(tw, underlyingInterface.Method(i))
-					dbscheme.MethodHostsTable.Emit(tw, methlbl, lbl)
+					extractMethod(tw, meth)
+				}
+
+				// associate all methods of underlying interface with this type
+				if underlyingInterface, ok := underlying.(*types.Interface); ok {
+					for i := 0; i < underlyingInterface.NumMethods(); i++ {
+						methlbl := extractMethod(tw, underlyingInterface.Method(i))
+						dbscheme.MethodHostsTable.Emit(tw, methlbl, lbl)
+					}
 				}
 			}
 		case *types.TypeParam: