Revert "[NFC] Make ObjCMethodConflicts a set"

This reverts commit d0cf8bc.

Author: beccadax

include/swift/AST/SourceFile.h

@@ -17,7 +17,6 @@
 #include "swift/AST/Import.h"
 #include "swift/AST/SynthesizedFileUnit.h"
 #include "swift/Basic/Debug.h"
-#include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
 
@@ -244,20 +243,11 @@ class SourceFile final : public FileUnit {
   std::vector<ObjCUnsatisfiedOptReq> ObjCUnsatisfiedOptReqs;
 
   /// A selector that is used by two different declarations in the same class.
-  struct ObjCMethodConflict {
-    NominalTypeDecl *typeDecl;
-    ObjCSelector selector;
-    bool isInstanceMethod;
-
-    ObjCMethodConflict(NominalTypeDecl *typeDecl, ObjCSelector selector,
-                       bool isInstanceMethod)
-        : typeDecl(typeDecl), selector(selector),
-          isInstanceMethod(isInstanceMethod)
-    {}
-  };
+  /// Fields: typeDecl, selector, isInstanceMethod.
+  using ObjCMethodConflict = std::tuple<NominalTypeDecl *, ObjCSelector, bool>;
 
   /// List of Objective-C member conflicts we have found during type checking.
-  llvm::SetVector<ObjCMethodConflict> ObjCMethodConflicts;
+  std::vector<ObjCMethodConflict> ObjCMethodConflicts;
 
   /// List of attributes added by access notes, used to emit remarks for valid
   /// ones.
@@ -646,30 +636,4 @@ inline void simple_display(llvm::raw_ostream &out, const SourceFile *SF) {
 }
 } // end namespace swift
 
-namespace llvm {
-
-template<>
-struct DenseMapInfo<swift::SourceFile::ObjCMethodConflict> {
-  using ObjCMethodConflict = swift::SourceFile::ObjCMethodConflict;
-
-  static inline ObjCMethodConflict getEmptyKey() {
-    return ObjCMethodConflict(nullptr, {}, false);
-  }
-  static inline ObjCMethodConflict getTombstoneKey() {
-    return ObjCMethodConflict(nullptr, {}, true);
-  }
-  static inline unsigned getHashValue(ObjCMethodConflict a) {
-    return hash_combine(hash_value(a.typeDecl),
-                  DenseMapInfo<swift::ObjCSelector>::getHashValue(a.selector),
-                  hash_value(a.isInstanceMethod));
-  }
-  static bool isEqual(ObjCMethodConflict a, ObjCMethodConflict b) {
-    return a.typeDecl == b.typeDecl && a.selector == b.selector &&
-           a.isInstanceMethod == b.isInstanceMethod;
-  }
-};
-
-}
-
-
 #endif

lib/AST/NameLookup.cpp

@@ -1714,11 +1714,12 @@ void NominalTypeDecl::recordObjCMethod(AbstractFunctionDecl *method,
     return;
 
   if (auto *sf = method->getParentSourceFile()) {
-    if (vec.empty()) {
-      sf->ObjCMethodList.push_back(method);
-    } else {
+    if (vec.size() == 1) {
       // We have a conflict.
-      sf->ObjCMethodConflicts.insert({ this, selector, isInstanceMethod });
+      sf->ObjCMethodConflicts.push_back(std::make_tuple(this, selector,
+                                                        isInstanceMethod));
+    } if (vec.empty()) {
+      sf->ObjCMethodList.push_back(method);
     }
   }
 

lib/Sema/TypeCheckDeclObjC.cpp

@@ -2422,8 +2422,11 @@ bool swift::diagnoseUnintendedObjCMethodOverrides(SourceFile &sf) {
 /// Retrieve the source file for the given Objective-C member conflict.
 static TinyPtrVector<AbstractFunctionDecl *>
 getObjCMethodConflictDecls(const SourceFile::ObjCMethodConflict &conflict) {
-  return conflict.typeDecl->lookupDirect(conflict.selector,
-                                         conflict.isInstanceMethod);
+  NominalTypeDecl *typeDecl = std::get<0>(conflict);
+  ObjCSelector selector = std::get<1>(conflict);
+  bool isInstanceMethod = std::get<2>(conflict);
+
+  return typeDecl->lookupDirect(selector, isInstanceMethod);
 }
 
 static ObjCAttr *getObjCAttrIfFromAccessNote(ValueDecl *VD) {
@@ -2449,8 +2452,7 @@ bool swift::diagnoseObjCMethodConflicts(SourceFile &sf) {
   // Sort the set of conflicts so we get a deterministic order for
   // diagnostics. We use the first conflicting declaration in each set to
   // perform the sort.
-  llvm::SmallVector<SourceFile::ObjCMethodConflict, 4> localConflicts;
-  llvm::copy(sf.ObjCMethodConflicts, std::back_inserter(localConflicts));
+  auto localConflicts = sf.ObjCMethodConflicts;
   std::sort(localConflicts.begin(), localConflicts.end(),
             [&](const SourceFile::ObjCMethodConflict &lhs,
                 const SourceFile::ObjCMethodConflict &rhs) {
@@ -2461,6 +2463,9 @@ bool swift::diagnoseObjCMethodConflicts(SourceFile &sf) {
   // Diagnose each conflict.
   bool anyConflicts = false;
   for (const auto &conflict : localConflicts) {
+    NominalTypeDecl *tyDecl = std::get<0>(conflict);
+    ObjCSelector selector = std::get<1>(conflict);
+
     auto methods = getObjCMethodConflictDecls(conflict);
 
     // Erase any invalid or stub declarations. We don't want to complain about
@@ -2540,10 +2545,10 @@ bool swift::diagnoseObjCMethodConflicts(SourceFile &sf) {
                                                 : diag::objc_redecl,
                                      diagInfo.first, diagInfo.second,
                                      origDiagInfo.first, origDiagInfo.second,
-                                     conflict.selector);
+                                     selector);
 
       // Protocols weren't checked for selector conflicts in 5.0.
-      diag.warnUntilSwiftVersionIf(!isa<ClassDecl>(conflict.typeDecl), 6);
+      diag.warnUntilSwiftVersionIf(!isa<ClassDecl>(tyDecl), 6);
 
       auto objcAttr = getObjCAttrIfFromAccessNote(conflictingDecl);
       swift::softenIfAccessNote(conflictingDecl, objcAttr, diag);