Use nullptr as missing value

Author: Bertik23

llvm/include/llvm/AsmParser/AsmParserContext.h

@@ -36,13 +36,30 @@ class AsmParserContext {
   std::optional<FileLocRange> getFunctionLocation(const Function *) const;
   std::optional<FileLocRange> getBlockLocation(const BasicBlock *) const;
   std::optional<FileLocRange> getInstructionLocation(const Instruction *) const;
-  std::optional<Function *> getFunctionAtLocation(const FileLocRange &) const;
-  std::optional<Function *> getFunctionAtLocation(const FileLoc &) const;
-  std::optional<BasicBlock *> getBlockAtLocation(const FileLocRange &) const;
-  std::optional<BasicBlock *> getBlockAtLocation(const FileLoc &) const;
-  std::optional<Instruction *>
-  getInstructionAtLocation(const FileLocRange &) const;
-  std::optional<Instruction *> getInstructionAtLocation(const FileLoc &) const;
+  /// Get the function at the requested location range.
+  /// If no single function occupies the queried range, or the record is
+  /// missing, a nullptr is returned.
+  Function *getFunctionAtLocation(const FileLocRange &) const;
+  /// Get the function at the requested location.
+  /// If no function occupies the queried location, or the record is missing, a
+  /// nullptr is returned.
+  Function *getFunctionAtLocation(const FileLoc &) const;
+  /// Get the block at the requested location range.
+  /// If no single block occupies the queried range, or the record is missing, a
+  /// nullptr is returned.
+  BasicBlock *getBlockAtLocation(const FileLocRange &) const;
+  /// Get the block at the requested location.
+  /// If no block occupies the queried location, or the record is missing, a
+  /// nullptr is returned.
+  BasicBlock *getBlockAtLocation(const FileLoc &) const;
+  /// Get the instruction at the requested location range.
+  /// If no single instruction occupies the queried range, or the record is
+  /// missing, a nullptr is returned.
+  Instruction *getInstructionAtLocation(const FileLocRange &) const;
+  /// Get the instruction at the requested location.
+  /// If no instruction occupies the queried location, or the record is missing,
+  /// a nullptr is returned.
+  Instruction *getInstructionAtLocation(const FileLoc &) const;
   bool addFunctionLocation(Function *, const FileLocRange &);
   bool addBlockLocation(BasicBlock *, const FileLocRange &);
   bool addInstructionLocation(Instruction *, const FileLocRange &);

llvm/lib/AsmParser/AsmParserContext.cpp

@@ -31,44 +31,42 @@ AsmParserContext::getInstructionLocation(const Instruction *I) const {
   return Instructions.at(I);
 }
 
-std::optional<Function *>
+Function *
 AsmParserContext::getFunctionAtLocation(const FileLocRange &Query) const {
   for (auto &[F, Loc] : Functions) {
     if (Loc.contains(Query))
       return F;
   }
-  return std::nullopt;
+  return nullptr;
 }
 
-std::optional<Function *>
-AsmParserContext::getFunctionAtLocation(const FileLoc &Query) const {
+Function *AsmParserContext::getFunctionAtLocation(const FileLoc &Query) const {
   return getFunctionAtLocation(FileLocRange(Query, Query));
 }
 
-std::optional<BasicBlock *>
+BasicBlock *
 AsmParserContext::getBlockAtLocation(const FileLocRange &Query) const {
   for (auto &[BB, Loc] : Blocks) {
     if (Loc.contains(Query))
       return BB;
   }
-  return std::nullopt;
+  return nullptr;
 }
 
-std::optional<BasicBlock *>
-AsmParserContext::getBlockAtLocation(const FileLoc &Query) const {
+BasicBlock *AsmParserContext::getBlockAtLocation(const FileLoc &Query) const {
   return getBlockAtLocation(FileLocRange(Query, Query));
 }
 
-std::optional<Instruction *>
+Instruction *
 AsmParserContext::getInstructionAtLocation(const FileLocRange &Query) const {
   for (auto &[I, Loc] : Instructions) {
     if (Loc.contains(Query))
       return I;
   }
-  return std::nullopt;
+  return nullptr;
 }
 
-std::optional<Instruction *>
+Instruction *
 AsmParserContext::getInstructionAtLocation(const FileLoc &Query) const {
   return getInstructionAtLocation(FileLocRange(Query, Query));
 }