Track changes from clang r212387, r212388

llvm-svn: 212390
This commit is contained in:
Alp Toker 2014-07-06 05:29:14 +00:00
parent 0f89fac7a5
commit 06164dd854
2 changed files with 3 additions and 3 deletions

View File

@ -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()),

View File

@ -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.