Enable -dump-deserialized-decls and -error-on-deserialized-decl <value> for modules

[v.g.vassilev]

Summary

Enable the useful -dump-deserialized-decls and -error-on-deserialized-decl <value> flags for modules builds, too.

[v.g.vassilev]

Landed in r294359.

lib/Frontend/FrontendAction.cpp

if (!usesPreprocessorOnly()) {
     if (!CI.getPreprocessorOpts().ChainedIncludes.empty()) {
       // Convert headers to PCH and chain them.
       IntrusiveRefCntPtr<ExternalSemaSource> source, FinalReader;
       source = createChainedIncludesSource(CI, FinalReader);
       if (!source)
         goto failure;
       CI.setModuleManager(static_cast<ASTReader *>(FinalReader.get()));
       CI.getASTContext().setExternalSource(source);
-    } else if (!CI.getPreprocessorOpts().ImplicitPCHInclude.empty()) {
-      // Use PCH.
+    } else if (CI.getLangOpts().Modules ||
+               !CI.getPreprocessorOpts().ImplicitPCHInclude.empty()) {
+      // Use PCM or PCH.
       assert(hasPCHSupport() && "This action does not have PCH support!");
       ASTDeserializationListener *DeserialListener =
           Consumer->GetASTDeserializationListener();
       bool DeleteDeserialListener = false;
       if (CI.getPreprocessorOpts().DumpDeserializedPCHDecls) {
         DeserialListener = new DeserializedDeclsDumper(DeserialListener,
                                                        DeleteDeserialListener);
         DeleteDeserialListener = true;
       }
       if (!CI.getPreprocessorOpts().DeserializedPCHDeclsToErrorOn.empty()) {
         DeserialListener = new DeserializedDeclsChecker(
             CI.getASTContext(),
             CI.getPreprocessorOpts().DeserializedPCHDeclsToErrorOn,
             DeserialListener, DeleteDeserialListener);
         DeleteDeserialListener = true;
       }
+      if (!CI.getPreprocessorOpts().ImplicitPCHInclude.empty()) {
         CI.createPCHExternalASTSource(
             CI.getPreprocessorOpts().ImplicitPCHInclude,
             CI.getPreprocessorOpts().DisablePCHValidation,
           CI.getPreprocessorOpts().AllowPCHWithCompilerErrors, DeserialListener,
             DeleteDeserialListener);
         if (!CI.getASTContext().getExternalSource())
           goto failure;
       }
+      // If modules are enabled, create the module manager before creating
+      // any builtins, so that all declarations know that they might be
+      // extended by an external source.
+      if (CI.getLangOpts().Modules || !CI.hasASTContext() ||
+          !CI.getASTContext().getExternalSource()) {
+        CI.createModuleManager();
+        CI.getModuleManager()->setDeserializationListener(DeserialListener,
+                                                        DeleteDeserialListener);
+      }
+    }
 
     CI.setASTConsumer(std::move(Consumer));
     if (!CI.hasASTConsumer())
       goto failure;
   }
 
   // Initialize built-in info as long as we aren't using an external AST
   // source.
-  if (!CI.hasASTContext() || !CI.getASTContext().getExternalSource()) {
+  if (CI.getLangOpts().Modules || !CI.hasASTContext() ||
+      !CI.getASTContext().getExternalSource()) {
     Preprocessor &PP = CI.getPreprocessor();
-
-    // If modules are enabled, create the module manager before creating
-    // any builtins, so that all declarations know that they might be
-    // extended by an external source.
-    if (CI.getLangOpts().Modules)
-      CI.createModuleManager();
-
     PP.getBuiltinInfo().initializeBuiltins(PP.getIdentifierTable(),
                                            PP.getLangOpts());
   } else {
     // FIXME: If this is a problem, recover from it by creating a multiplex
     // source.
     assert((!CI.getLangOpts().Modules || CI.getModuleManager()) &&
            "modules enabled but created an external source that "
            "doesn't support modules");