[lldb] Fix that C++ base name is only calculated when Swift plugin is… #1940
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
… enabled In 41c6ab2 I put the C++ GetBasename() call in Module::LookupInfo behind the LLDB_ENABLE_SWIFT as it appeard to be introduced by a downstream Swift change. However our downstream change actually changed ``` basename = cpp_method.GetBasename(); ``` into ``` if (swift) /*swift stuff*/ else if (c++) basename = cpp_method.GetBasename(); ``` By putting both if and the else behind LLDB_ENABLE_SWIFT this actually broke LLDB's ability to set C++ breakpoints by function name when LLDB_ENABLE_SWIFT wasn't set (which in turn broke the TestCPPBreakpointLocations test). This patch moves `#ifdef LLDB_ENABLE_SWIFT` only around the Swift-specific part and leaves the basename calculation enabled independently of Swift. I also removed the unnecessary `else` as we can't have a method that has both a language value of Swift and C++, so those branches are anyway mutually exlusive and comparing the `language` enum value is cheap. (cherry picked from commit c24d7bf)
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.
… enabled
In 41c6ab2 I put the C++ GetBasename() call
in Module::LookupInfo behind the LLDB_ENABLE_SWIFT as it appeard to be
introduced by a downstream Swift change. However our downstream change
actually changed
into
By putting both if and the else behind LLDB_ENABLE_SWIFT this actually broke
LLDB's ability to set C++ breakpoints by function name when LLDB_ENABLE_SWIFT
wasn't set (which in turn broke the TestCPPBreakpointLocations test).
This patch moves
#ifdef LLDB_ENABLE_SWIFTonly around the Swift-specificpart and leaves the basename calculation enabled independently of Swift.
I also removed the unnecessary
elseas we can't have a method that hasboth a language value of Swift and C++, so those branches are anyway mutually
exlusive and comparing the
languageenum value is cheap.(cherry picked from commit c24d7bf)