Skip to content

Commit d345c1f

Browse files
kazutakahirataTIFitis
authored andcommitted
[lldb] Use std::optional::value_or (NFC) (llvm#140011)
1 parent fe38030 commit d345c1f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2479,8 +2479,8 @@ Function *DWARFASTParserClang::ParseFunctionFromDWARF(
24792479
std::unique_ptr<Declaration> decl_up;
24802480
if (decl_file || decl_line || decl_column)
24812481
decl_up = std::make_unique<Declaration>(
2482-
die.GetCU()->GetFile(decl_file ? *decl_file : 0),
2483-
decl_line ? *decl_line : 0, decl_column ? *decl_column : 0);
2482+
die.GetCU()->GetFile(decl_file.value_or(0)), decl_line.value_or(0),
2483+
decl_column.value_or(0));
24842484

24852485
SymbolFileDWARF *dwarf = die.GetDWARF();
24862486
// Supply the type _only_ if it has already been parsed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,15 +1358,15 @@ size_t SymbolFileDWARF::ParseBlocksRecursive(CompileUnit &comp_unit,
13581358
if (decl_file || decl_line || decl_column)
13591359
decl_up = std::make_unique<Declaration>(
13601360
comp_unit.GetSupportFiles().GetFileSpecAtIndex(
1361-
decl_file ? *decl_file : 0),
1362-
decl_line ? *decl_line : 0, decl_column ? *decl_column : 0);
1361+
decl_file.value_or(0)),
1362+
decl_line.value_or(0), decl_column.value_or(0));
13631363

13641364
std::unique_ptr<Declaration> call_up;
13651365
if (call_file || call_line || call_column)
13661366
call_up = std::make_unique<Declaration>(
13671367
comp_unit.GetSupportFiles().GetFileSpecAtIndex(
1368-
call_file ? *call_file : 0),
1369-
call_line ? *call_line : 0, call_column ? *call_column : 0);
1368+
call_file.value_or(0)),
1369+
call_line.value_or(0), call_column.value_or(0));
13701370

13711371
block->SetInlinedFunctionInfo(name, mangled_name, decl_up.get(),
13721372
call_up.get());

0 commit comments

Comments
 (0)