Distinguish types with and without explicit aliases in the type-label cache

Author: smowton

go/extractor/extractor.go

@@ -1689,7 +1689,8 @@ func getTypeLabel(tw *trap.Writer, tp types.Type) (trap.Label, bool) {
 }
 
 func getTypeLabelWithFlags(tw *trap.Writer, tp types.Type, transparentAliases bool) (trap.Label, bool) {
-	lbl, exists := tw.Labeler.TypeLabels[tp]
+	typeLabelKey := trap.TypeLabelsKey{Type: tp, TransparentAliases: transparentAliases}
+	lbl, exists := tw.Labeler.TypeLabels[typeLabelKey]
 	if !exists {
 		switch tp := tp.(type) {
 		case *types.Basic:
@@ -1833,7 +1834,7 @@ func getTypeLabelWithFlags(tw *trap.Writer, tp types.Type, transparentAliases bo
 		default:
 			log.Fatalf("(getTypeLabel) unexpected type %T", tp)
 		}
-		tw.Labeler.TypeLabels[tp] = lbl
+		tw.Labeler.TypeLabels[typeLabelKey] = lbl
 	}
 	return lbl, exists
 }

go/extractor/trap/labels.go

@@ -19,17 +19,22 @@ func (lbl *Label) String() string {
 	return lbl.id
 }
 
+type TypeLabelsKey struct {
+	Type               types.Type
+	TransparentAliases bool
+}
+
 // Labeler is used to represent labels for a file. It is used to write
 // associate objects with labels.
 type Labeler struct {
 	tw *Writer
 
 	nextid       int
 	fileLabel    Label
-	nodeLabels   map[interface{}]Label  // labels associated with AST nodes
-	scopeLabels  map[*types.Scope]Label // labels associated with scopes
-	objectLabels map[types.Object]Label // labels associated with objects (that is, declared entities)
-	TypeLabels   map[types.Type]Label   // labels associated with types
+	nodeLabels   map[interface{}]Label   // labels associated with AST nodes
+	scopeLabels  map[*types.Scope]Label  // labels associated with scopes
+	objectLabels map[types.Object]Label  // labels associated with objects (that is, declared entities)
+	TypeLabels   map[TypeLabelsKey]Label // labels associated with types
 	keyLabels    map[string]Label
 }
 
@@ -41,7 +46,7 @@ func newLabeler(tw *Writer) *Labeler {
 		make(map[interface{}]Label),
 		make(map[*types.Scope]Label),
 		make(map[types.Object]Label),
-		make(map[types.Type]Label),
+		make(map[TypeLabelsKey]Label),
 		make(map[string]Label),
 	}
 }