Merge pull request #17445 from dcci/mynongenericsignaturepain

Author: swift-ci

lib/IDE/TypeReconstruction.cpp

@@ -786,9 +786,10 @@ static void VisitNodeGenericTypealias(ASTContext *ast,
       cast<TypeAliasDecl>(generic_type_result._decls.front());
   GenericSignature *signature = genericTypeAlias->getGenericSignature();
   // FIXME: handle conformances.
-  SubstitutionMap subMap =
-      SubstitutionMap::get(signature, template_types_result._types,
-                           ArrayRef<ProtocolConformanceRef>({}));
+  SubstitutionMap subMap;
+  if (signature)
+    subMap = SubstitutionMap::get(signature, template_types_result._types,
+                                  ArrayRef<ProtocolConformanceRef>({}));
   Type parentType;
   if (auto nominal = genericTypeAlias->getDeclContext()
                          ->getAsNominalTypeOrNominalTypeExtensionContext()) {

test/DebugInfo/DumpTypeFromMangledName.swift

@@ -39,3 +39,18 @@ func main() -> Int {
 }
 
 let _ = main()
+
+public struct tinky : Equatable, Hashable {
+  internal let _value: Int
+
+  public var hashValue: Int {
+    return 0
+  }
+}
+
+public func == (lhs: tinky, rhs: tinky) -> Bool {
+  return true
+}
+
+public typealias patatino = UnsafePointer<tinky>
+var local_thread_one: patatino?

test/DebugInfo/Inputs/type-reconstr-names.txt

@@ -10,3 +10,4 @@ $S13EyeCandySwift21_previousUniqueNumber33_ADC08935D64EA4F796440E7335798735LLs6U
 $SSayypXpG ---> Array<Any.Type>
 $S12EyeCandyCore11XPCListenerC14messageHandleryyAA13XPCConnectionV_AA10XPCMessageVxtcvpfiyAF_AHxtcfU_TA.4 ---> Can't resolve type of $S12EyeCandyCore11XPCListenerC14messageHandleryyAA13XPCConnectionV_AA10XPCMessageVxtcvpfiyAF_AHxtcfU_TA.4
 $Ss10CollectionP7ElementQa ---> Can't resolve type of $Ss10CollectionP7ElementQa
+$S12TypeReconstr8patatinoayAA5tinkyVGSgD ---> Optional<patatino>