Profile and dump the ordinal of OpaqueTypeArchetypeType.

The "profile" of OpaqueTypeArchetypeType didn't contain the ordinal,
so multiple opaque types would collide.

Author: DougGregor

include/swift/AST/Types.h

@@ -5605,10 +5605,11 @@ class OpaqueTypeArchetypeType final : public ArchetypeType,
 
   static void Profile(llvm::FoldingSetNodeID &ID,
                       OpaqueTypeDecl *OpaqueDecl,
+                      unsigned ordinal,
                       SubstitutionMap Substitutions);
 
   void Profile(llvm::FoldingSetNodeID &ID) {
-    Profile(ID, getDecl(), getSubstitutions());
+    Profile(ID, getDecl(), getOrdinal(), getSubstitutions());
   };
 
 private:

lib/AST/ASTContext.cpp

@@ -4283,7 +4283,7 @@ OpaqueTypeArchetypeType::get(OpaqueTypeDecl *Decl, unsigned ordinal,
   Substitutions = Substitutions.getCanonical();
 
   llvm::FoldingSetNodeID id;
-  Profile(id, Decl, Substitutions);
+  Profile(id, Decl, ordinal, Substitutions);
 
   auto &ctx = Decl->getASTContext();
 

lib/AST/ASTDumper.cpp

@@ -3776,6 +3776,7 @@ namespace {
                                       StringRef label) {
       printArchetypeCommon(T, "opaque_type", label);
       printField("decl", T->getDecl()->getNamingDecl()->printRef());
+      printField("ordinal", T->getOrdinal());
       if (!T->getSubstitutions().empty()) {
         OS << '\n';
         SmallPtrSet<const ProtocolConformance *, 4> Dumped;

lib/AST/Type.cpp

@@ -3781,8 +3781,10 @@ std::string ArchetypeType::getFullName() const {
 void
 OpaqueTypeArchetypeType::Profile(llvm::FoldingSetNodeID &id,
                                  OpaqueTypeDecl *decl,
+                                 unsigned ordinal,
                                  SubstitutionMap subs) {
   id.AddPointer(decl);
+  id.AddInteger(ordinal);
   subs.profile(id);
 }