diff options
author | Chris Lattner <sabre@nondot.org> | 2010-11-23 08:35:12 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-11-23 08:35:12 +0000 |
commit | 39b49bcaaddb1049234fca9500c0ac02c088e23d (patch) | |
tree | 4f7ac9da3cf2bcbad0aebfb781b7635462b431cf /lib/Frontend/ASTMerge.cpp | |
parent | 458b5e25052a1052eb873f9145298e0f0aa75cd1 (diff) | |
download | clang-39b49bcaaddb1049234fca9500c0ac02c088e23d.tar.gz |
now the FileManager has a FileSystemOpts ivar, stop threading
FileSystemOpts through a ton of apis, simplifying a lot of code.
This also fixes a latent bug in ASTUnit where it would invoke
methods on FileManager without creating one in some code paths
in cindextext.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120010 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/ASTMerge.cpp')
-rw-r--r-- | lib/Frontend/ASTMerge.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/Frontend/ASTMerge.cpp b/lib/Frontend/ASTMerge.cpp index d4ed8d3e03..ec074415c1 100644 --- a/lib/Frontend/ASTMerge.cpp +++ b/lib/Frontend/ASTMerge.cpp @@ -51,10 +51,8 @@ void ASTMergeAction::ExecuteAction() { ASTImporter Importer(CI.getASTContext(), CI.getFileManager(), - CI.getFileSystemOpts(), Unit->getASTContext(), - Unit->getFileManager(), - Unit->getFileSystemOpts()); + Unit->getFileManager()); TranslationUnitDecl *TU = Unit->getASTContext().getTranslationUnitDecl(); for (DeclContext::decl_iterator D = TU->decls_begin(), |