Skip to content

Commit f70c4c3

Browse files
committed
[lldb][TypeSystemClang][NFC] Make TemplateParamterInfos::pack_name a std::optional
1 parent 2ebdbc5 commit f70c4c3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ class TypeSystemClang : public TypeSystem {
353353
bool IsValid() const {
354354
// Having a pack name but no packed args doesn't make sense, so mark
355355
// these template parameters as invalid.
356-
if (pack_name && !packed_args)
356+
if (HasPackName() && !packed_args)
357357
return false;
358358
return args.size() == names.size() &&
359359
(!packed_args || !packed_args->packed_args);
@@ -394,14 +394,14 @@ class TypeSystemClang : public TypeSystem {
394394
return packed_args->GetArgs();
395395
}
396396

397-
bool HasPackName() const { return pack_name && pack_name[0]; }
397+
bool HasPackName() const { return pack_name.has_value(); }
398398

399399
llvm::StringRef GetPackName() const {
400400
assert(HasPackName());
401-
return pack_name;
401+
return pack_name.value();
402402
}
403403

404-
void SetPackName(char const *name) { pack_name = name; }
404+
void SetPackName(char const *name) { pack_name.emplace(name); }
405405

406406
void SetParameterPack(std::unique_ptr<TemplateParameterInfos> args) {
407407
packed_args = std::move(args);
@@ -413,7 +413,7 @@ class TypeSystemClang : public TypeSystem {
413413
llvm::SmallVector<const char *, 2> names;
414414
llvm::SmallVector<clang::TemplateArgument, 2> args;
415415

416-
const char * pack_name = nullptr;
416+
std::optional<std::string> pack_name;
417417
std::unique_ptr<TemplateParameterInfos> packed_args;
418418
};
419419

0 commit comments

Comments
 (0)