[llvm] Use std::optional::value_or (NFC) (#109568)

Author: kazutakahirata

llvm/include/llvm/Analysis/TargetTransformInfoImpl.h

@@ -858,7 +858,7 @@ class TargetTransformInfoImplBase {
       unsigned RemainingBytes, unsigned SrcAddrSpace, unsigned DestAddrSpace,
       Align SrcAlign, Align DestAlign,
       std::optional<uint32_t> AtomicCpySize) const {
-    unsigned OpSizeInBytes = AtomicCpySize ? *AtomicCpySize : 1;
+    unsigned OpSizeInBytes = AtomicCpySize.value_or(1);
     Type *OpType = Type::getIntNTy(Context, OpSizeInBytes * 8);
     for (unsigned i = 0; i != RemainingBytes; i += OpSizeInBytes)
       OpsOut.push_back(OpType);

llvm/lib/CGData/OutlinedHashTree.cpp

@@ -84,7 +84,7 @@ void OutlinedHashTree::insert(const HashSequencePair &SequencePair) {
       Current = I->second.get();
   }
   if (Count)
-    Current->Terminals = (Current->Terminals ? *Current->Terminals : 0) + Count;
+    Current->Terminals = Current->Terminals.value_or(0) + Count;
 }
 
 void OutlinedHashTree::merge(const OutlinedHashTree *Tree) {
@@ -98,8 +98,7 @@ void OutlinedHashTree::merge(const OutlinedHashTree *Tree) {
     if (!SrcNode)
       continue;
     if (SrcNode->Terminals)
-      DstNode->Terminals =
-          (DstNode->Terminals ? *DstNode->Terminals : 0) + *SrcNode->Terminals;
+      DstNode->Terminals = DstNode->Terminals.value_or(0) + *SrcNode->Terminals;
     for (auto &[Hash, NextSrcNode] : SrcNode->Successors) {
       HashNode *NextDstNode;
       auto I = DstNode->Successors.find(Hash);

llvm/lib/CGData/OutlinedHashTreeRecord.cpp

@@ -130,7 +130,7 @@ void OutlinedHashTreeRecord::convertToStableData(
     auto Id = P.second;
     HashNodeStable NodeStable;
     NodeStable.Hash = Node->Hash;
-    NodeStable.Terminals = Node->Terminals ? *Node->Terminals : 0;
+    NodeStable.Terminals = Node->Terminals.value_or(0);
     for (auto &P : Node->Successors)
       NodeStable.SuccessorIds.push_back(NodeIdMap[P.second.get()]);
     IdNodeStableMap[Id] = NodeStable;

llvm/lib/DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp

@@ -1171,8 +1171,7 @@ void CompileUnit::cloneDieAttrExpression(
         // Argument of DW_OP_addrx should be relocated here as it is not
         // processed by applyValidRelocs.
         OutputExpression.push_back(dwarf::DW_OP_addr);
-        uint64_t LinkedAddress =
-            SA->Address + (VarAddressAdjustment ? *VarAddressAdjustment : 0);
+        uint64_t LinkedAddress = SA->Address + VarAddressAdjustment.value_or(0);
         if (getEndianness() != llvm::endianness::native)
           sys::swapByteOrder(LinkedAddress);
         ArrayRef<uint8_t> AddressBytes(
@@ -1209,7 +1208,7 @@ void CompileUnit::cloneDieAttrExpression(
         if (OutOperandKind) {
           OutputExpression.push_back(*OutOperandKind);
           uint64_t LinkedAddress =
-              SA->Address + (VarAddressAdjustment ? *VarAddressAdjustment : 0);
+              SA->Address + VarAddressAdjustment.value_or(0);
           if (getEndianness() != llvm::endianness::native)
             sys::swapByteOrder(LinkedAddress);
           ArrayRef<uint8_t> AddressBytes(

llvm/lib/ObjCopy/wasm/WasmWriter.cpp

@@ -32,8 +32,7 @@ Writer::SectionHeader Writer::createSectionHeader(const Section &S,
   // If we read this section from an object file, use its original size for the
   // padding of the LEB value to avoid changing the file size. Otherwise, pad
   // out to 5 bytes to make it predictable, and match the behavior of clang.
-  unsigned HeaderSecSizeEncodingLen =
-      S.HeaderSecSizeEncodingLen ? *S.HeaderSecSizeEncodingLen : 5;
+  unsigned HeaderSecSizeEncodingLen = S.HeaderSecSizeEncodingLen.value_or(5);
   encodeULEB128(SectionSize, OS, HeaderSecSizeEncodingLen);
   if (HasName) {
     encodeULEB128(S.Name.size(), OS);

llvm/lib/ObjectYAML/ELFEmitter.cpp

@@ -966,7 +966,7 @@ ELFState<ELFT>::toELFSymbols(ArrayRef<ELFYAML::Symbol> Symbols,
       Symbol.st_shndx = *Sym.Index;
 
     Symbol.st_value = Sym.Value.value_or(yaml::Hex64(0));
-    Symbol.st_other = Sym.Other ? *Sym.Other : 0;
+    Symbol.st_other = Sym.Other.value_or(0);
     Symbol.st_size = Sym.Size.value_or(yaml::Hex64(0));
   }
 

llvm/lib/ObjectYAML/GOFFEmitter.cpp

@@ -237,11 +237,9 @@ void GOFFState::writeHeader(GOFFYAML::FileHeader &FileHdr) {
   if (ModPropLen) {
     GW << binaryBe(ModPropLen) << zeros(6);
     if (ModPropLen >= 2)
-      GW << binaryBe(FileHdr.InternalCCSID ? *FileHdr.InternalCCSID : 0);
+      GW << binaryBe(FileHdr.InternalCCSID.value_or(0));
     if (ModPropLen >= 3)
-      GW << binaryBe(FileHdr.TargetSoftwareEnvironment
-                         ? *FileHdr.TargetSoftwareEnvironment
-                         : 0);
+      GW << binaryBe(FileHdr.TargetSoftwareEnvironment.value_or(0));
   }
 }
 

llvm/lib/ObjectYAML/WasmEmitter.cpp

@@ -648,7 +648,7 @@ bool WasmWriter::writeWasm(raw_ostream &OS) {
     StringStream.flush();
 
     unsigned HeaderSecSizeEncodingLen =
-        Sec->HeaderSecSizeEncodingLen ? *Sec->HeaderSecSizeEncodingLen : 5;
+        Sec->HeaderSecSizeEncodingLen.value_or(5);
     unsigned RequiredLen = getULEB128Size(OutString.size());
     // Wasm spec does not allow LEBs larger than 5 bytes
     assert(RequiredLen <= 5);

llvm/lib/ObjectYAML/XCOFFEmitter.cpp

@@ -794,7 +794,7 @@ bool XCOFFWriter::writeSymbols() {
       }
       W.write<int16_t>(SectionIndexMap[*YamlSym.SectionName]);
     } else {
-      W.write<int16_t>(YamlSym.SectionIndex ? *YamlSym.SectionIndex : 0);
+      W.write<int16_t>(YamlSym.SectionIndex.value_or(0));
     }
     W.write<uint16_t>(YamlSym.Type);
     W.write<uint8_t>(YamlSym.StorageClass);

llvm/lib/ProfileData/PGOCtxProfWriter.cpp

@@ -47,7 +47,7 @@ PGOCtxProfileWriter::PGOCtxProfileWriter(
   }
   Writer.ExitBlock();
   Writer.EnterSubblock(PGOCtxProfileBlockIDs::ProfileMetadataBlockID, CodeLen);
-  const auto Version = VersionOverride ? *VersionOverride : CurrentVersion;
+  const auto Version = VersionOverride.value_or(CurrentVersion);
   Writer.EmitRecord(PGOCtxProfileRecords::Version,
                     SmallVector<unsigned, 1>({Version}));
 }