Add ModuleFile::isSIB

We can't make the same assumptions about .sib files.

Ideally, we should serialize the module's stage and set WasDeserializedCanonical
based on that state. However, we probably still want the IsSIB flag for
assertions.

Author: atrick

include/swift/Serialization/ModuleFile.h

@@ -87,6 +87,11 @@ class ModuleFile
   /// The number of entities that are currently being deserialized.
   unsigned NumCurrentDeserializingEntities = 0;
 
+  /// Is this module file actually a .sib file? .sib files are serialized SIL at
+  /// arbitrary granularity and arbitrary stage; unlike serialized Swift
+  /// modules, which are assumed to contain canonical SIL for an entire module.
+  bool IsSIB = false;
+
   /// RAII class to be used when deserializing an entity.
   class DeserializingEntityRAII {
     ModuleFile &MF;

lib/Serialization/DeserializeSIL.cpp

@@ -507,9 +507,10 @@ SILFunction *SILDeserializer::readSILFunction(DeclID FID,
     if (Callback) Callback->didDeserialize(MF->getAssociatedModule(), fn);
   }
   // Mark this function as deserialized. This avoids rerunning diagnostic
-  // passes. Certain passes in the madatory pipeline may expect not to rerun
+  // passes. Certain passes in the madatory pipeline may not work as expected
   // after arbitrary optimization and lowering.
-  fn->setWasDeserializedCanonical();
+  if (!MF->IsSIB)
+    fn->setWasDeserializedCanonical();
 
   assert(fn->empty() &&
          "SILFunction to be deserialized starts being empty.");

lib/Serialization/ModuleFile.cpp

@@ -1115,6 +1115,7 @@ ModuleFile::ModuleFile(
       Name = info.name;
       TargetTriple = info.targetTriple;
       CompatibilityVersion = info.compatibilityVersion;
+      IsSIB = extInfo->isSIB();
 
       hasValidControlBlock = true;
       break;