Merge pull request #430 from apple/revert-424-master

Revert "Adding missing changes on the Pull Request #402"

Author: swiftix

lib/Serialization/Serialization.cpp

@@ -3715,7 +3715,7 @@ void Serializer::writeToStream(raw_ostream &os, ModuleOrSourceFile DC,
     BCBlockRAII moduleBlock(S.Out, MODULE_BLOCK_ID, 2);
     S.writeHeader(options);
     S.writeInputBlock(options);
-    S.writeSIL(SILMod);
+    S.writeSIL(SILMod, options.SerializeAllSIL);
     S.writeAST(DC);
   }
 

lib/Serialization/Serialization.h

@@ -314,7 +314,7 @@ class Serializer {
                     const std::vector<BitOffset> &values);
 
   /// Serializes all transparent SIL functions in the SILModule.
-  void writeSIL(const SILModule *M);
+  void writeSIL(const SILModule *M, bool serializeAllSIL);
 
   /// Top-level entry point for serializing a module.
   void writeAST(ModuleOrSourceFile DC);