Skip to content

[lldb] Fix off-by-one error in ToDwarfSourceLanguage #162315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2025
Merged

[lldb] Fix off-by-one error in ToDwarfSourceLanguage #162315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
248f4ed
[lldb] Fix off-by-one error in ToDwarfSourceLanguage
joshpeterson Oct 7, 2025
3254a97
Add a test for the last language type
joshpeterson Oct 7, 2025
790b947
Allow the test to use the last language type
joshpeterson Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lldb/source/Target/Language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ Language::~Language() = default;

static std::optional<llvm::dwarf::SourceLanguage>
ToDwarfSourceLanguage(lldb::LanguageType language_type) {
if (language_type < lldb::eLanguageTypeLastStandardLanguage)
if (language_type <= lldb::eLanguageTypeLastStandardLanguage)
return static_cast<llvm::dwarf::SourceLanguage>(language_type);

switch (language_type) {
Expand Down
16 changes: 13 additions & 3 deletions lldb/unittests/Target/LanguageTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ TEST_F(LanguageTest, SourceLanguage_GetDescription) {
continue;

auto lang_type = static_cast<lldb::LanguageType>(i);
if (lang_type == lldb::eLanguageTypeLastStandardLanguage)
continue;

SourceLanguage lang(lang_type);

// eLanguageTypeHIP is not implemented as a DW_LNAME because of a conflict.
Expand Down Expand Up @@ -67,3 +64,16 @@ TEST_F(LanguageTest, SourceLanguage_AsLanguageType) {
EXPECT_EQ(SourceLanguage(eLanguageTypeUnknown).AsLanguageType(),
eLanguageTypeUnknown);
}

TEST_F(LanguageTest, SourceLanguage_LastStandardLanguage) {
// eLanguageTypeLastStandardLanguage should be treated as a standard DWARF
// language.
SourceLanguage lang(eLanguageTypeLastStandardLanguage);
EXPECT_TRUE(lang);

// It should have a valid description (not "Unknown").
EXPECT_NE(lang.GetDescription(), "Unknown");

// It should convert to the correct language type.
EXPECT_EQ(lang.AsLanguageType(), eLanguageTypeLastStandardLanguage);
}
Loading