From 5530fb586f30da9dcb434f6be39198dbf016b866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Duncan=20P=2E=20N=2E=20Exon=C2=A0Smith?= Date: Fri, 30 Oct 2020 14:04:48 -0400 Subject: [PATCH] Speculative fix for bots after 84e8257937ec6a332aa0b688f4dce57016516ffd, v2 Looks like some bots don't like the defaulted default constructor, try being explicit. --- clang/include/clang/Basic/FileEntry.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 to use FileEntryRef and its /// optional_none_tag to keep it the size of a single pointer. template <> class OptionalStorage { - 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;