[lldb] Fix embedded type summary regex handling #8121
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
|
@swift-ci test |
|
@swift-ci test |
|
The new test fails in CI, but passes for me locally. I am not yet sure why. |
|
@swift-ci test macOS |
|
@swift-ci test macOS |
|
@swift-ci test macOS |
|
@swift-ci test macOS |
|
@swift-ci test |
|
@swift-ci test windows |
kastiglione
deleted the
dl/lldb-Fix-embedded-type-summary-regex-handling
branch
| @@ -1452,7 +1452,7 @@ static void LoadTypeSummariesForModule(ModuleSP module_sp) { | |||
| return; | |||
|
|
|||
| Log *log = GetLog(LLDBLog::DataFormatters); | |||
| const char *module_name = module_sp->GetObjectName().GetCString(); | |||
| const char *module_name = module_sp->GetFileSpec().GetFilename().GetCString(); | |||
There was a problem hiding this comment.
Micro-optimization: since this is only used in LLDB_LOGF, we can save the C string conversion by using LLDB_LOG instead and use a StringRef.
| @@ -1488,7 +1488,7 @@ static void LoadTypeSummariesForModule(ModuleSP module_sp) { | |||
| auto summary_sp = | |||
| std::make_shared<StringSummaryFormat>(flags, summary_string.data()); | |||
| FormatterMatchType match_type = eFormatterMatchExact; | |||
| if (summary_string.front() == '^' && summary_string.back() == '$') | |||
| if (type_name.front() == '^') | |||
There was a problem hiding this comment.
It just dawned on me that in Pascal, ^ is the equivalent of * in C and thus can be part of a type name. In the next revision we probably should include an isRegex bit in the header.
There was a problem hiding this comment.
and AFAIK there are downstream Pascal compilers that target LLDB.
kastiglione
added a commit
that referenced
this pull request
Feb 16, 2024
Fixes a logic error when determining if a type is a regex. Look for a leading `^` in the type name, not the summary string. Adds a test to verify regex handling. Fixes a log message to help debugging. (cherry-picked from commit 81ae1b5)
kastiglione
added a commit
that referenced
this pull request
Feb 16, 2024
Fixes a logic error when determining if a type is a regex. Look for a leading `^` in the type name, not the summary string. Adds a test to verify regex handling. Fixes a log message to help debugging. (cherry-picked from commit 81ae1b5)
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.
Fixes a logic error when determining if a type is a regex. Look for a leading
^in the type name, not the summary string.Adds a test to verify regex handling.
Fixes a log message to help debugging.