[llvm] [BOLT] Use std::optional::value_or (NFC) (PR #151628)

Kazu Hirata via llvm-commits llvm-commits at lists.llvm.org
Thu Jul 31 19:48:35 PDT 2025


https://github.com/kazutakahirata created https://github.com/llvm/llvm-project/pull/151628

None

>From eaadda19828657fd37dfe1d65255c06e151b3c5d Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Thu, 31 Jul 2025 13:34:37 -0700
Subject: [PATCH] [BOLT] Use std::optional::value_or (NFC)

---
 bolt/lib/Core/Exceptions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bolt/lib/Core/Exceptions.cpp b/bolt/lib/Core/Exceptions.cpp
index 0b2e63b8ca6a7..874419f592cc9 100644
--- a/bolt/lib/Core/Exceptions.cpp
+++ b/bolt/lib/Core/Exceptions.cpp
@@ -500,7 +500,7 @@ bool CFIReaderWriter::fillCFIInfoFor(BinaryFunction &Function) const {
 
   const FDE &CurFDE = *I->second;
   std::optional<uint64_t> LSDA = CurFDE.getLSDAAddress();
-  Function.setLSDAAddress(LSDA ? *LSDA : 0);
+  Function.setLSDAAddress(LSDA.value_or(0));
 
   uint64_t Offset = Function.getFirstInstructionOffset();
   uint64_t CodeAlignment = CurFDE.getLinkedCIE()->getCodeAlignmentFactor();



More information about the llvm-commits mailing list