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/lib/Frontend/FrontendAction.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'clang/lib/Frontend/FrontendAction.cpp') diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index a3b4080..e97a2dd 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/lib/Frontend/FrontendAction.cpp @@ -40,7 +40,6 @@ #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" #include -#include #include using namespace clang; @@ -824,7 +823,7 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI, Dir = *DirOrErr; SmallVector, 1> CWD; CWD.push_back({nullptr, Dir}); - std::optional FE = + Optional FE = HS.LookupFile(FileName, SourceLocation(), /*Angled*/ Input.getKind().getHeaderUnitKind() == InputKind::HeaderUnit_System, -- cgit v1.1