go/analysis/passes/stringintconv: post gotypesalias=1 tweak

stringintconv will return the alias name if available.
Make the test agnostic.

Updates golang/go#64581

Change-Id: I47d245c62f45cd6c02f45ba5eb770318dcb7cbec
Reviewed-on: https://go-review.googlesource.com/c/tools/+/577657
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: Robert Findley <[email protected]>

Author: adonovan

go/analysis/passes/stringintconv/string.go

@@ -59,14 +59,13 @@ func describe(typ, inType types.Type, inName string) string {
 	return name
 }
 
-func typeName(typ types.Type) string {
-	typ = aliases.Unalias(typ)
-	// TODO(adonovan): don't discard alias type, return its name.
-	if v, _ := typ.(*types.Basic); v != nil {
-		return v.Name()
-	}
-	if v, _ := typ.(interface{ Obj() *types.TypeName }); v != nil { // Named, TypeParam
-		return v.Obj().Name()
+func typeName(t types.Type) string {
+	type hasTypeName interface{ Obj() *types.TypeName } // Alias, Named, TypeParam
+	switch t := t.(type) {
+	case *types.Basic:
+		return t.Name()
+	case hasTypeName:
+		return t.Obj().Name()
 	}
 	return ""
 }

go/analysis/passes/stringintconv/testdata/src/a/a.go

@@ -30,7 +30,7 @@ func StringTest() {
 	_ = string(k)
 	_ = string(p)    // want `^conversion from untyped int to string yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 	_ = A(l)         // want `^conversion from C \(int\) to A \(string\) yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
-	_ = B(m)         // want `^conversion from uintptr to B \(string\) yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
+	_ = B(m)         // want `^conversion from (uintptr|D \(uintptr\)) to B \(string\) yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 	_ = string(n[1]) // want `^conversion from int to string yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 	_ = string(o.x)  // want `^conversion from int to string yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 }

go/analysis/passes/stringintconv/testdata/src/a/a.go.golden

@@ -30,7 +30,7 @@ func StringTest() {
 	_ = string(k)
 	_ = string(rune(p))    // want `^conversion from untyped int to string yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 	_ = A(rune(l))         // want `^conversion from C \(int\) to A \(string\) yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
-	_ = B(rune(m))         // want `^conversion from uintptr to B \(string\) yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
+	_ = B(rune(m))         // want `^conversion from (uintptr|D \(uintptr\)) to B \(string\) yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 	_ = string(rune(n[1])) // want `^conversion from int to string yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 	_ = string(rune(o.x))  // want `^conversion from int to string yields a string of one rune, not a string of digits \(did you mean fmt\.Sprint\(x\)\?\)$`
 }