Merge pull request #5193 from swiftix/wip-sil-opened-archetypes-tracker-fixes

Multiple fixes to fix the release builds

Author: swiftix

include/swift/SIL/SILOpenedArchetypesTracker.h

@@ -32,6 +32,16 @@ namespace swift {
 class SILOpenedArchetypesTracker : public DeleteNotificationHandler {
 public:
   typedef llvm::DenseMap<Type, SILValue> OpenedArchetypeDefsMap;
+
+  SILOpenedArchetypesTracker(SILOpenedArchetypesTracker &Tracker)
+      : SILOpenedArchetypesTracker(Tracker.F, Tracker) {}
+
+  SILOpenedArchetypesTracker(const SILOpenedArchetypesTracker &Tracker)
+      : SILOpenedArchetypesTracker(Tracker.F) {
+    assert(Tracker.getOpenedArchetypeDefs().empty() &&
+           "Only empty const SILOpenedArchetypesTracker can be copied");
+  }
+
   // Re-use pre-populated map if available.
   SILOpenedArchetypesTracker(const SILFunction &F,
                              SILOpenedArchetypesTracker &Tracker)
@@ -105,6 +115,9 @@ class SILOpenedArchetypesTracker : public DeleteNotificationHandler {
   }
 
 private:
+  // Never copy
+  SILOpenedArchetypesTracker &operator = (const SILOpenedArchetypesTracker &) = delete;
+
   /// The function whose opened archetypes are being tracked.
   /// Used only for verification purposes.
   const SILFunction &F;

include/swift/Serialization/ModuleFile.h

@@ -79,7 +79,7 @@ class ModuleFile : public LazyMemberLoader {
   StringRef IdentifierData;
 
   /// A callback to be invoked every time a type was deserialized.
-  llvm::function_ref<void(Type)> DeserializedTypeCallback;
+  std::function<void(Type)> DeserializedTypeCallback;
 
 public:
   /// Represents another module that has been imported as a dependency.

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -1601,7 +1601,8 @@ bool SimplifyCFG::simplifySwitchEnumUnreachableBlocks(SwitchEnumInst *SEI) {
     .createUncheckedEnumData(SEI->getLoc(), SEI->getOperand(), Element, Ty);
 
   assert(Dest->bbarg_size() == 1 && "Expected only one argument!");
-  ArrayRef<SILValue> Args = { UED };
+  SmallVector<SILValue, 1> Args;
+  Args.push_back(UED);
   SILBuilderWithScope(SEI).createBranch(SEI->getLoc(), Dest, Args);
 
   addToWorklist(SEI->getParent());

lib/SILOptimizer/Utils/Generics.cpp

@@ -628,37 +628,37 @@ static bool linkSpecialization(SILModule &M, SILFunction *F) {
   return false;
 }
 
+// The whitelist of classes and functions from the stdlib,
+// whose specializations we want to preserve.
+static const char *const WhitelistedSpecializations[] = {
+    "Array",
+    "_ArrayBuffer",
+    "_ContiguousArrayBuffer",
+    "Range",
+    "RangeIterator",
+    "CountableRange",
+    "CountableRangeIterator",
+    "ClosedRange",
+    "ClosedRangeIterator",
+    "CountableClosedRange",
+    "CountableClosedRangeIterator",
+    "IndexingIterator",
+    "Collection",
+    "MutableCollection",
+    "BidirectionalCollection",
+    "RandomAccessCollection",
+    "RangeReplaceableCollection",
+    "_allocateUninitializedArray",
+    "UTF8",
+    "UTF16",
+    "String",
+    "_StringBuffer",
+    "_toStringReadOnlyPrintable",
+};
+
 /// Check of a given name could be a name of a white-listed
 /// specialization.
 bool swift::isWhitelistedSpecialization(StringRef SpecName) {
-  // The whitelist of classes and functions from the stdlib,
-  // whose specializations we want to preserve.
-  ArrayRef<StringRef> Whitelist = {
-      "Array",
-      "_ArrayBuffer",
-      "_ContiguousArrayBuffer",
-      "Range",
-      "RangeIterator",
-      "CountableRange",
-      "CountableRangeIterator",
-      "ClosedRange",
-      "ClosedRangeIterator",
-      "CountableClosedRange",
-      "CountableClosedRangeIterator",
-      "IndexingIterator",
-      "Collection",
-      "MutableCollection",
-      "BidirectionalCollection",
-      "RandomAccessCollection",
-      "RangeReplaceableCollection",
-      "_allocateUninitializedArray",
-      "UTF8",
-      "UTF16",
-      "String",
-      "_StringBuffer",
-      "_toStringReadOnlyPrintable",
-  };
-
   // TODO: Once there is an efficient API to check if
   // a given symbol is a specialization of a specific type,
   // use it instead. Doing demangling just for this check
@@ -701,7 +701,8 @@ bool swift::isWhitelistedSpecialization(StringRef SpecName) {
 
   pos += OfStr.size();
 
-  for (auto Name: Whitelist) {
+  for (auto NameStr: WhitelistedSpecializations) {
+    StringRef Name = NameStr;
     auto pos1 = DemangledName.find(Name, pos);
     if (pos1 == pos && !isalpha(DemangledName[pos1+Name.size()])) {
       return true;