diff options
| author | Ben Langmuir <blangmuir@apple.com> | 2014-02-28 21:16:07 +0000 |
|---|---|---|
| committer | Ben Langmuir <blangmuir@apple.com> | 2014-02-28 21:16:07 +0000 |
| commit | d066d4c849be06a01c0d17e8dc206913f4e7bfe3 (patch) | |
| tree | 546f4a519c542578e5c03bfe24077319ffab8f2b /clang/lib/Lex/PTHLexer.cpp | |
| parent | a98d400fec0e41392d66eb1c1df631c534a8760c (diff) | |
| download | llvm-d066d4c849be06a01c0d17e8dc206913f4e7bfe3.zip llvm-d066d4c849be06a01c0d17e8dc206913f4e7bfe3.tar.gz llvm-d066d4c849be06a01c0d17e8dc206913f4e7bfe3.tar.bz2 | |
Reapply fixed "Honour 'use-external-names' in FileManager"
Was r202442
There were two issues with the original patch that have now been fixed.
1. We were memset'ing over a FileEntry in a test case. After adding a
std::string to FileEntry, this still happened to not break for me.
2. I didn't pass the FileManager into the new compiler instance in
compileModule. This was hidden in some cases by the fact I didn't
clear the module cache in the test.
Also, I changed the copy constructor for FileEntry, which was memcpy'ing
in a (now) unsafe way.
llvm-svn: 202539
Diffstat (limited to 'clang/lib/Lex/PTHLexer.cpp')
| -rw-r--r-- | clang/lib/Lex/PTHLexer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Lex/PTHLexer.cpp b/clang/lib/Lex/PTHLexer.cpp index cdc5d7e..dd8363d 100644 --- a/clang/lib/Lex/PTHLexer.cpp +++ b/clang/lib/Lex/PTHLexer.cpp @@ -688,6 +688,7 @@ public: if (!D.HasData) return CacheMissing; + Data.Name = Path; Data.Size = D.Size; Data.ModTime = D.ModTime; Data.UniqueID = D.UniqueID; |