Merge branch 'llvm:main' into main

santhoshe447 · web-flow · commit 7fff3206d82f · 2025-08-01T19:33:01.000+05:30
diff --git 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();
diff --git a/lldb/source/Interpreter/OptionArgParser.cpp b/lldb/source/Interpreter/OptionArgParser.cpp
@@ -161,7 +161,7 @@ lldb::addr_t OptionArgParser::ToRawAddress(const ExecutionContext *exe_ctx,
                                            lldb::addr_t fail_value,
                                            Status *error_ptr) {
   std::optional<lldb::addr_t> maybe_addr = DoToAddress(exe_ctx, s, error_ptr);
-  return maybe_addr ? *maybe_addr : fail_value;
+  return maybe_addr.value_or(fail_value);
 }
 
 lldb::addr_t OptionArgParser::ToAddress(const ExecutionContext *exe_ctx,

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ lldb::addr_t OptionArgParser::ToRawAddress(const ExecutionContext *exe_ctx,`
`161`	`161`	`lldb::addr_t fail_value,`
`162`	`162`	`Status *error_ptr) {`
`163`	`163`	`std::optional<lldb::addr_t> maybe_addr = DoToAddress(exe_ctx, s, error_ptr);`
`164`		`- return maybe_addr ? *maybe_addr : fail_value;`
	`164`	`+ return maybe_addr.value_or(fail_value);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`lldb::addr_t OptionArgParser::ToAddress(const ExecutionContext *exe_ctx,`