Track changes from clang r212387, r212388

llvm-svn: 212390

diff --git a/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp b/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp
index 955432e..d4c8b72 100644 (file)
--- a/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp
+++ b/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp
@@ -215,7 +215,7 @@ ModuleMapChecker::ModuleMapChecker(StringRef ModuleMapPath,
       Diagnostics(
           new DiagnosticsEngine(DiagIDs, DiagnosticOpts.get(), &DC, false)),
       TargetOpts(new ModuleMapTargetOptions()),
-      Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts.get())),
+      Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts)),
       FileMgr(new FileManager(FileSystemOpts)),
       SourceMgr(new SourceManager(*Diagnostics, *FileMgr, false)),
       HeaderSearchOpts(new HeaderSearchOptions()),

diff --git a/clang-tools-extra/module-map-checker/ModuleMapChecker.h b/clang-tools-extra/module-map-checker/ModuleMapChecker.h
index 2159aa4..8b555e2 100644 (file)
--- a/clang-tools-extra/module-map-checker/ModuleMapChecker.h
+++ b/clang-tools-extra/module-map-checker/ModuleMapChecker.h
@@ -59,7 +59,7 @@ class ModuleMapChecker {
   // Supporting objects.
 
   /// Options controlling the language variant.
-  llvm::IntrusiveRefCntPtr<clang::LangOptions> LangOpts;
+  std::shared_ptr<clang::LangOptions> LangOpts;
   /// Diagnostic IDs.
   const llvm::IntrusiveRefCntPtr<clang::DiagnosticIDs> DiagIDs;
   /// Options controlling the diagnostic engine.
@@ -69,7 +69,7 @@ class ModuleMapChecker {
   /// Diagnostic engine.
   llvm::IntrusiveRefCntPtr<clang::DiagnosticsEngine> Diagnostics;
   /// Options controlling the target.
-  llvm::IntrusiveRefCntPtr<clang::TargetOptions> TargetOpts;
+  std::shared_ptr<clang::TargetOptions> TargetOpts;
   /// Target information.
   llvm::IntrusiveRefCntPtr<clang::TargetInfo> Target;
   /// Options controlling the file system manager.