[clang] 5530fb5 - Speculative fix for bots after 84e8257937ec6a332aa0b688f4dce57016516ffd, v2

[Duncan P. N. Exon Smith via cfe-commits]

Author: Duncan P. N. Exon Smith
Date: 2020-10-30T14:04:48-04:00
New Revision: 5530fb586f30da9dcb434f6be39198dbf016b866

URL: https://github.com/llvm/llvm-project/commit/5530fb586f30da9dcb434f6be39198dbf016b866
DIFF: https://github.com/llvm/llvm-project/commit/5530fb586f30da9dcb434f6be39198dbf016b866.diff

LOG: Speculative fix for bots after 84e8257937ec6a332aa0b688f4dce57016516ffd, v2

Looks like some bots don't like the defaulted default constructor, try
being explicit.

Added: 
    

Modified: 
    clang/include/clang/Basic/FileEntry.h

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Basic/FileEntry.h b/clang/include/clang/Basic/FileEntry.h
index 03697c584b0b..89788b1e68f9 100644
--- a/clang/include/clang/Basic/FileEntry.h
+++ b/clang/include/clang/Basic/FileEntry.h
@@ -167,11 +167,12 @@ namespace optional_detail {
 /// Customize OptionalStorage<FileEntryRef> to use FileEntryRef and its
 /// optional_none_tag to keep it the size of a single pointer.
 template <> class OptionalStorage<clang::FileEntryRef> {
-  clang::FileEntryRef MaybeRef = clang::FileEntryRef::optional_none_tag{};
+  clang::FileEntryRef MaybeRef;
 
 public:
   ~OptionalStorage() = default;
-  constexpr OptionalStorage() noexcept = default;
+  constexpr OptionalStorage() noexcept
+      : MaybeRef(clang::FileEntryRef::optional_none_tag) {}
   constexpr OptionalStorage(OptionalStorage const &Other) = default;
   constexpr OptionalStorage(OptionalStorage &&Other) = default;
   OptionalStorage &operator=(OptionalStorage const &Other) = default;