Fixes for Clang API change

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@291203 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 16 insertions, 21 deletions

diff --git a/modularize/ModularizeUtilities.cpp b/modularize/ModularizeUtilities.cpp
index 07df3e63..bb098da9 100644
--- a/modularize/ModularizeUtilities.cpp
+++ b/modularize/ModularizeUtilities.cpp
@@ -44,25 +44,22 @@ public:
 ModularizeUtilities::ModularizeUtilities(std::vector<std::string> &InputPaths,
                                          llvm::StringRef Prefix,
                                          llvm::StringRef ProblemFilesListPath)
-  : InputFilePaths(InputPaths),
-    HeaderPrefix(Prefix),
-    ProblemFilesPath(ProblemFilesListPath),
-    HasModuleMap(false),
-    MissingHeaderCount(0),
-    // Init clang stuff needed for loading the module map and preprocessing.
-    LangOpts(new LangOptions()), DiagIDs(new DiagnosticIDs()),
-    DiagnosticOpts(new DiagnosticOptions()),
-    DC(llvm::errs(), DiagnosticOpts.get()),
-    Diagnostics(
-    new DiagnosticsEngine(DiagIDs, DiagnosticOpts.get(), &DC, false)),
-    TargetOpts(new ModuleMapTargetOptions()),
-    Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts)),
-    FileMgr(new FileManager(FileSystemOpts)),
-    SourceMgr(new SourceManager(*Diagnostics, *FileMgr, false)),
-    HeaderSearchOpts(new HeaderSearchOptions()),
-    HeaderInfo(new HeaderSearch(HeaderSearchOpts, *SourceMgr, *Diagnostics,
-    *LangOpts, Target.get())) {
-}
+    : InputFilePaths(InputPaths), HeaderPrefix(Prefix),
+      ProblemFilesPath(ProblemFilesListPath), HasModuleMap(false),
+      MissingHeaderCount(0),
+      // Init clang stuff needed for loading the module map and preprocessing.
+      LangOpts(new LangOptions()), DiagIDs(new DiagnosticIDs()),
+      DiagnosticOpts(new DiagnosticOptions()),
+      DC(llvm::errs(), DiagnosticOpts.get()),
+      Diagnostics(
+          new DiagnosticsEngine(DiagIDs, DiagnosticOpts.get(), &DC, false)),
+      TargetOpts(new ModuleMapTargetOptions()),
+      Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts)),
+      FileMgr(new FileManager(FileSystemOpts)),
+      SourceMgr(new SourceManager(*Diagnostics, *FileMgr, false)),
+      HeaderInfo(new HeaderSearch(std::make_shared<HeaderSearchOptions>(),
+                                  *SourceMgr, *Diagnostics, *LangOpts,
+                                  Target.get())) {}
 
 // Create instance of ModularizeUtilities, to simplify setting up
 // subordinate objects.
diff --git a/modularize/ModularizeUtilities.h b/modularize/ModularizeUtilities.h
index a3c412e4..4ad2b565 100644
--- a/modularize/ModularizeUtilities.h
+++ b/modularize/ModularizeUtilities.h
@@ -214,8 +214,6 @@ public:
   llvm::IntrusiveRefCntPtr<clang::FileManager> FileMgr;
   /// Source manager.
   llvm::IntrusiveRefCntPtr<clang::SourceManager> SourceMgr;
-  /// Options controlling the \#include directive.
-  llvm::IntrusiveRefCntPtr<clang::HeaderSearchOptions> HeaderSearchOpts;
   /// Header search manager.
   std::unique_ptr<clang::HeaderSearch> HeaderInfo;
   // The loaded module map objects.