Author: Nico Weber Date: 2020-10-27T20:10:48-04:00 New Revision: 739d4bf8f43d0a5a3a99e07b1647ded1ce1d81b3
URL: https://github.com/llvm/llvm-project/commit/739d4bf8f43d0a5a3a99e07b1647ded1ce1d81b3 DIFF: https://github.com/llvm/llvm-project/commit/739d4bf8f43d0a5a3a99e07b1647ded1ce1d81b3.diff LOG: Unbreak build with gcc5.3 after 917acac Added: Modified: clang/include/clang/Basic/FileManager.h clang/lib/Basic/FileManager.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Basic/FileManager.h b/clang/include/clang/Basic/FileManager.h index d27b4260cca7..12848f42770e 100644 --- a/clang/include/clang/Basic/FileManager.h +++ b/clang/include/clang/Basic/FileManager.h @@ -107,7 +107,9 @@ class FileEntryRef { /// VFSs that use external names. In that case, the \c FileEntryRef /// returned by the \c FileManager will have the external name, and not the /// name that was used to lookup the file. - llvm::PointerUnion<FileEntry *, const MapEntry *> V; + // The second type is really a `const MapEntry *`, but that confuses gcc5.3. + // Once that's no longer supported, change this back. + llvm::PointerUnion<FileEntry *, const void *> V; MapValue() = delete; MapValue(FileEntry &FE) : V(&FE) {} diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index d26ead4a5b09..38d9403eadb9 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/lib/Basic/FileManager.cpp @@ -215,7 +215,8 @@ FileManager::getFileRef(StringRef Filename, bool openFile, bool CacheFailure) { FileEntryRef::MapValue Value = *SeenFileInsertResult.first->second; if (LLVM_LIKELY(Value.V.is<FileEntry *>())) return FileEntryRef(*SeenFileInsertResult.first); - return FileEntryRef(*Value.V.get<const FileEntryRef::MapEntry *>()); + return FileEntryRef(*reinterpret_cast<const FileEntryRef::MapEntry *>( + Value.V.get<const void *>())); } // We've not seen this before. Fill it in. @@ -347,7 +348,8 @@ FileManager::getVirtualFile(StringRef Filename, off_t Size, FileEntry *FE; if (LLVM_LIKELY(FE = Value.V.dyn_cast<FileEntry *>())) return FE; - return &FileEntryRef(*Value.V.get<const FileEntryRef::MapEntry *>()) + return &FileEntryRef(*reinterpret_cast<const FileEntryRef::MapEntry *>( + Value.V.get<const void *>())) .getFileEntry(); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
