Display generic function type parameters in backtraces. #8703
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
There was a global cache for Swift display names, however, it didn't take the symbol context into account, which means the demangling result is non-deterministic depending on whether the symbol context had the necessary debug info to resolve the names of archetypes or not. In addition to that Display names are not supposed to be on a hot path (unlike names, which are used to resolve breakpoints).
This patch changes the behavior of SwiftLanguage::GetFunctionDisplayName() so it now: - (if exe_ctx && sc available) does generic parameter binding - (if only sc availble) shows the archetype name - the letter τ will now only appear if neither no context whatsover is available - (drive by) omits self rdar://126883922
adrian-prantl
requested review from
augusto2112,
JDevlieghere,
kastiglione and
felipepiovezan
|
@swift-ci test |
|
@swift-ci test linux |
| @@ -1730,6 +1735,8 @@ bool SwiftLanguage::GetFunctionDisplayName( | |||
| VariableSP var_sp(args.GetVariableAtIndex(arg_idx)); | |||
| ValueObjectSP var_value_sp( | |||
| ValueObjectVariable::Create(exe_scope, var_sp)); | |||
| if (!var_sp || !var_value_sp || var_sp->IsArtificial()) | |||
There was a problem hiding this comment.
I assume this is the self bit you mentioned in the commit message?
There was a problem hiding this comment.
can you explain a little more, where is self being omitted? Is there a test for it that I've overlooked?
felipepiovezan
approved these changes
May 7, 2024
kastiglione
reviewed
May 7, 2024
| @@ -498,10 +498,10 @@ bool Function::IsTopLevelFunction() { | |||
| return result; | |||
| } | |||
|
|
|||
| ConstString Function::GetDisplayName(const SymbolContext *sc) const { | |||
There was a problem hiding this comment.
What's the reason the SymbolContext is no longer plumbed through?
kastiglione
reviewed
May 7, 2024
| stream = lldb.SBStream() | ||
| bkpt.GetLocationAtIndex(0).GetDescription(stream, 1) | ||
| desc = stream.GetData() | ||
| self.assertIn("C.f<T>(T, U) -> ()", desc) |
There was a problem hiding this comment.
shouldn't this be C.f<U>(T, U)? The function's generic parameter is named U in the source, and its containing class has the generic type named T. If this test is passing, do we have a bug?
There was a problem hiding this comment.
I'll track that separately and fix it in a follow-up, since it isn't a regression.
JDevlieghere
approved these changes
May 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This patch changes the behavior of SwiftLanguage::GetFunctionDisplayName()
so it now:
rdar://126883922