From 205c0589f918f95d2f2c586a01bea2716d73d603 Mon Sep 17 00:00:00 2001 From: Krzysztof Parzyszek Date: Sun, 18 Dec 2022 11:19:40 -0800 Subject: Revert "[clang] Convert OptionalFileEntryRefDegradesToFileEntryPtr to std::optional" This reverts commit 8f0df9f3bbc6d7f3d5cbfd955c5ee4404c53a75d. The Optional*RefDegradesTo*EntryPtr types want to keep the same size as the underlying type, which std::optional doesn't guarantee. For use with llvm::Optional, they define their own storage class, and there is no way to do that in std::optional. On top of that, that commit broke builds with older GCCs, where std::optional was not trivially copyable (static_assert in the clang sources was failing). --- clang/unittests/Basic/FileManagerTest.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'clang/unittests/Basic/FileManagerTest.cpp') diff --git a/clang/unittests/Basic/FileManagerTest.cpp b/clang/unittests/Basic/FileManagerTest.cpp index 6ccde51..6fe4a3d 100644 --- a/clang/unittests/Basic/FileManagerTest.cpp +++ b/clang/unittests/Basic/FileManagerTest.cpp @@ -14,7 +14,6 @@ #include "llvm/Support/VirtualFileSystem.h" #include "llvm/Testing/Support/Error.h" #include "gtest/gtest.h" -#include using namespace llvm; using namespace clang; @@ -543,7 +542,7 @@ TEST_F(FileManagerTest, getBypassFile) { EXPECT_EQ(FE.getSize(), 10); // Bypass the file. - std::optional BypassRef = + llvm::Optional BypassRef = Manager.getBypassFile(File->getLastRef()); ASSERT_TRUE(BypassRef); EXPECT_EQ("/tmp/test", BypassRef->getName()); -- cgit v1.1