From e3b557809604d036af6e00c60f012c2025b59a5e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 11 Feb 2023 13:38:04 +0100 Subject: Vendor import of llvm-project main llvmorg-16-init-18548-gb0daacf58f41, the last commit before the upstream release/17.x branch was created. --- clang/lib/Analysis/MacroExpansionContext.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'clang/lib/Analysis/MacroExpansionContext.cpp') diff --git a/clang/lib/Analysis/MacroExpansionContext.cpp b/clang/lib/Analysis/MacroExpansionContext.cpp index 290510691891..564e359668a5 100644 --- a/clang/lib/Analysis/MacroExpansionContext.cpp +++ b/clang/lib/Analysis/MacroExpansionContext.cpp @@ -8,6 +8,7 @@ #include "clang/Analysis/MacroExpansionContext.h" #include "llvm/Support/Debug.h" +#include #define DEBUG_TYPE "macro-expansion-context" @@ -96,14 +97,14 @@ void MacroExpansionContext::registerForPreprocessor(Preprocessor &NewPP) { PP->setTokenWatcher([this](const Token &Tok) { onTokenLexed(Tok); }); } -Optional +std::optional MacroExpansionContext::getExpandedText(SourceLocation MacroExpansionLoc) const { if (MacroExpansionLoc.isMacroID()) - return llvm::None; + return std::nullopt; - // If there was no macro expansion at that location, return None. + // If there was no macro expansion at that location, return std::nullopt. if (ExpansionRanges.find_as(MacroExpansionLoc) == ExpansionRanges.end()) - return llvm::None; + return std::nullopt; // There was macro expansion, but resulted in no tokens, return empty string. const auto It = ExpandedTokens.find_as(MacroExpansionLoc); @@ -114,14 +115,14 @@ MacroExpansionContext::getExpandedText(SourceLocation MacroExpansionLoc) const { return It->getSecond().str(); } -Optional +std::optional MacroExpansionContext::getOriginalText(SourceLocation MacroExpansionLoc) const { if (MacroExpansionLoc.isMacroID()) - return llvm::None; + return std::nullopt; const auto It = ExpansionRanges.find_as(MacroExpansionLoc); if (It == ExpansionRanges.end()) - return llvm::None; + return std::nullopt; assert(It->getFirst() != It->getSecond() && "Every macro expansion must cover a non-empty range."); -- cgit v1.2.3