diff options
| -rw-r--r-- | include/clang/Serialization/ASTReader.h | 1 | ||||
| -rw-r--r-- | lib/Serialization/ASTReader.cpp | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h index 297b577eee..2744865819 100644 --- a/include/clang/Serialization/ASTReader.h +++ b/include/clang/Serialization/ASTReader.h @@ -1135,6 +1135,7 @@ public: ~ASTReader(); SourceManager &getSourceManager() const { return SourceMgr; } + FileManager &getFileManager() const { return FileMgr; } /// \brief Flags that indicate what kind of AST loading failures the client /// of the AST reader can directly handle. diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index e6ef9f6441..4a4f2aaf91 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -1309,11 +1309,10 @@ bool HeaderFileInfoTrait::EqualKey(internal_key_type a, internal_key_type b) { return false; // Determine whether the actual files are equivalent. - bool Result = false; - if (llvm::sys::fs::equivalent(a, b, Result)) - return false; - - return Result; + FileManager &FileMgr = Reader.getFileManager(); + const FileEntry *FEA = FileMgr.getFile(a); + const FileEntry *FEB = FileMgr.getFile(b); + return (FEA && FEA == FEB); } std::pair<unsigned, unsigned> |