Rework (de-)serialization of generic and inherited conformances.

IdentifierIDs and TypeIDs should be kept distinct. Instead, conflict
DeclID and TypeID, which is acceptable.


Swift SVN r6906

lib/Serialization/ModuleFile.h

@@ -198,8 +198,8 @@ private:
   /// protocol conformance.
   ProtocolConformance *
   readUnderlyingConformance(ProtocolDecl *proto,
-                            serialization::DeclID nominalID,
-                            serialization::IdentifierID moduleOrTypeID);
+                            serialization::DeclID typeID,
+                            serialization::IdentifierID moduleID);
 
   /// Recursively reads a protocol conformance from \c DeclTypeCursor.
   ///