fixup! no need for std::optional

(cherry picked from commit 7aeed0f)

Author: Michael137

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

@@ -250,14 +250,14 @@ static unsigned GetCXXMethodCVQuals(const DWARFDIE &subprogram,
   return cv_quals;
 }
 
-static std::optional<std::string> MakeLLDBFuncAsmLabel(const DWARFDIE &die) {
+static std::string MakeLLDBFuncAsmLabel(const DWARFDIE &die) {
   char const *name = die.GetMangledName(/*substitute_name_allowed*/ false);
   if (!name)
-    return std::nullopt;
+    return {};
 
   SymbolFileDWARF *dwarf = die.GetDWARF();
   if (!dwarf)
-    return std::nullopt;
+    return {};
 
   auto get_module_id = [&](SymbolFile *sym) {
     if (!sym)
@@ -279,11 +279,11 @@ static std::optional<std::string> MakeLLDBFuncAsmLabel(const DWARFDIE &die) {
     module_id = get_module_id(dwarf);
 
   if (module_id == LLDB_INVALID_UID)
-    return std::nullopt;
+    return {};
 
   const auto die_id = die.GetID();
   if (die_id == LLDB_INVALID_UID)
-    return std::nullopt;
+    return {};
 
   return FunctionCallLabel{/*module_id=*/module_id,
                            /*symbol_id=*/die_id,

lldb/unittests/Symbol/TestTypeSystemClang.cpp

@@ -869,11 +869,7 @@ TEST_F(TestTypeSystemClang, TestFunctionTemplateConstruction) {
   CompilerType clang_type = m_ast->CreateFunctionType(int_type, {}, false, 0U);
   FunctionDecl *func = m_ast->CreateFunctionDeclaration(
       TU, OptionalClangModuleID(), "foo", clang_type, StorageClass::SC_None,
-<<<<<<< HEAD
       false, /*asm_label=*/{});
-=======
-      false, std::nullopt);
->>>>>>> 382395408c4b ([lldb][Expression] Encode Module and DIE UIDs into function AsmLabels)
   TypeSystemClang::TemplateParameterInfos empty_params;
 
   // Create the actual function template.
@@ -904,11 +900,7 @@ TEST_F(TestTypeSystemClang, TestFunctionTemplateInRecordConstruction) {
   // 2. It is mirroring the behavior of DWARFASTParserClang::ParseSubroutine.
   FunctionDecl *func = m_ast->CreateFunctionDeclaration(
       TU, OptionalClangModuleID(), "foo", clang_type, StorageClass::SC_None,
-<<<<<<< HEAD
       false, /*asm_label=*/{});
-=======
-      false, std::nullopt);
->>>>>>> 382395408c4b ([lldb][Expression] Encode Module and DIE UIDs into function AsmLabels)
   TypeSystemClang::TemplateParameterInfos empty_params;
 
   // Create the actual function template.
@@ -946,11 +938,7 @@ TEST_F(TestTypeSystemClang, TestDeletingImplicitCopyCstrDueToMoveCStr) {
   bool is_attr_used = false;
   bool is_artificial = false;
   m_ast->AddMethodToCXXRecordType(
-<<<<<<< HEAD
       t.GetOpaqueQualType(), class_name, /*asm_label=*/{}, function_type,
-=======
-      t.GetOpaqueQualType(), class_name, std::nullopt, function_type,
->>>>>>> 382395408c4b ([lldb][Expression] Encode Module and DIE UIDs into function AsmLabels)
       lldb::AccessType::eAccessPublic, is_virtual, is_static, is_inline,
       is_explicit, is_attr_used, is_artificial);
 
@@ -987,11 +975,7 @@ TEST_F(TestTypeSystemClang, TestNotDeletingUserCopyCstrDueToMoveCStr) {
     CompilerType function_type = m_ast->CreateFunctionType(
         return_type, args, /*variadic=*/false, /*quals*/ 0U);
     m_ast->AddMethodToCXXRecordType(
-<<<<<<< HEAD
         t.GetOpaqueQualType(), class_name, /*asm_label=*/{}, function_type,
-=======
-        t.GetOpaqueQualType(), class_name, std::nullopt, function_type,
->>>>>>> 382395408c4b ([lldb][Expression] Encode Module and DIE UIDs into function AsmLabels)
         lldb::AccessType::eAccessPublic, is_virtual, is_static, is_inline,
         is_explicit, is_attr_used, is_artificial);
   }
@@ -1003,11 +987,7 @@ TEST_F(TestTypeSystemClang, TestNotDeletingUserCopyCstrDueToMoveCStr) {
         m_ast->CreateFunctionType(return_type, args,
                                   /*variadic=*/false, /*quals*/ 0U);
     m_ast->AddMethodToCXXRecordType(
-<<<<<<< HEAD
         t.GetOpaqueQualType(), class_name, /*asm_label=*/{}, function_type,
-=======
-        t.GetOpaqueQualType(), class_name, std::nullopt, function_type,
->>>>>>> 382395408c4b ([lldb][Expression] Encode Module and DIE UIDs into function AsmLabels)
         lldb::AccessType::eAccessPublic, is_virtual, is_static, is_inline,
         is_explicit, is_attr_used, is_artificial);
   }
@@ -1118,11 +1098,7 @@ TEST_F(TestTypeSystemClang, AddMethodToCXXRecordType_ParmVarDecls) {
       m_ast->CreateFunctionType(return_type, param_types,
                                 /*variadic=*/false, /*quals*/ 0U);
   m_ast->AddMethodToCXXRecordType(
-<<<<<<< HEAD
       t.GetOpaqueQualType(), "myFunc", /*asm_label=*/{}, function_type,
-=======
-      t.GetOpaqueQualType(), "myFunc", std::nullopt, function_type,
->>>>>>> 382395408c4b ([lldb][Expression] Encode Module and DIE UIDs into function AsmLabels)
       lldb::AccessType::eAccessPublic, is_virtual, is_static, is_inline,
       is_explicit, is_attr_used, is_artificial);