[lldb][Language] Simplify SourceLanguage::GetDescription #161804
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently we don't benefit from the user-friendly names that `LanguageDescription` returns because we would always use `Language::GetNameForLanguageType`. I'm not aware of a situation where `GetDescription` should prefer the non-human readable form of the name with. This patch removes the call to `GetNameForLanguageType`.
|
@llvm/pr-subscribers-lldb Author: Michael Buch (Michael137) ChangesCurrently we don't benefit from the user-friendly names that Full diff: https://github.com/llvm/llvm-project/pull/161804.diff 1 Files Affected:
diff --git a/lldb/source/Target/Language.cpp b/lldb/source/Target/Language.cpp
index 484d9badde397..7ce85dd93f091 100644
--- a/lldb/source/Target/Language.cpp
+++ b/lldb/source/Target/Language.cpp
@@ -559,11 +559,8 @@ lldb::LanguageType SourceLanguage::AsLanguageType() const {
}
llvm::StringRef SourceLanguage::GetDescription() const {
- LanguageType type = AsLanguageType();
- if (type)
- return Language::GetNameForLanguageType(type);
return llvm::dwarf::LanguageDescription(
- (llvm::dwarf::SourceLanguageName)name);
+ static_cast<llvm::dwarf::SourceLanguageName>(name));
}
bool SourceLanguage::IsC() const { return name == llvm::dwarf::DW_LNAME_C; }
|
Michael137
force-pushed
the
lldb/language-description-api
branch
from
89bda08 to
29d911d
Compare
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
Michael137
force-pushed
the
lldb/language-description-api
branch
from
65aceb1 to
bc4952c
Compare
lldb/source/Target/Language.cpp
Outdated
| default: break; | ||
| } | ||
|
|
||
| llvm_unreachable("Unhandled language type"); |
There was a problem hiding this comment.
Are we sure we cannot get here even if. we parse DWARF with e.g., a DW_LANG_user_low+n language attribute?
There was a problem hiding this comment.
Otherwise a fail-safe that doesn't crash might be more appropriate.
There was a problem hiding this comment.
true if the debuggee was compiled with a compiler that emitted a vendor language that LLDB isn't aware of. That would hit this codepath. Let me relax this a bit
adrian-prantl
approved these changes
Oct 3, 2025
Michael137
added a commit
that referenced
this pull request
Oct 3, 2025
…1803) The intention for this API is to be used when presenting language names to the user, e.g., in expression evaluation diagnostics or LLDB errors. Most uses of `GetNameForLanguageType` can be probably replaced with `GetDisplayNameForLanguageType`, but that's out of scope of this PR. This uses `llvm::dwarf::LanguageDescription` under the hood, so we would lose the version numbers in the names. If we deem those to be important, we could switch to an implementation that hardcodes a list of user-friendly names with version numbers included. The intention is to use it from #161688 Depends on #161804
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Oct 3, 2025
…pe API (#161803) The intention for this API is to be used when presenting language names to the user, e.g., in expression evaluation diagnostics or LLDB errors. Most uses of `GetNameForLanguageType` can be probably replaced with `GetDisplayNameForLanguageType`, but that's out of scope of this PR. This uses `llvm::dwarf::LanguageDescription` under the hood, so we would lose the version numbers in the names. If we deem those to be important, we could switch to an implementation that hardcodes a list of user-friendly names with version numbers included. The intention is to use it from llvm/llvm-project#161688 Depends on llvm/llvm-project#161804
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently we don't benefit from the user-friendly names that
LanguageDescriptionreturns because we would always useLanguage::GetNameForLanguageType. I'm not aware of a situation whereGetDescriptionshould prefer the non-human readable form of the name with. This patch removes the call toGetNameForLanguageType.LanguageDescriptionalready handles languages that it doesn't know about. For those it would returnUnknown. The LLDB language types should all be available via DWARF. If there are languages that don't map cleanly betweenlldb::LanguageTypeandDW_LANG, then we should add explicit support for that in theSourceLanguage::SourceLanguageconstructor.