[lldb] Add assert to NonNullSharedPtr move constructor #168979
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
Member
|
@llvm/pr-subscribers-lldb Author: Jonas Devlieghere (JDevlieghere) ChangesAs suggested by Augusto, add an assert to the NonNullSharedPtr move constructor. Full diff: https://github.com/llvm/llvm-project/pull/168979.diff 1 Files Affected:
diff --git a/lldb/include/lldb/Utility/NonNullSharedPtr.h b/lldb/include/lldb/Utility/NonNullSharedPtr.h
index 7e12ce72c6238..5011822503c77 100644
--- a/lldb/include/lldb/Utility/NonNullSharedPtr.h
+++ b/lldb/include/lldb/Utility/NonNullSharedPtr.h
@@ -29,12 +29,13 @@ template <typename T> class NonNullSharedPtr : private std::shared_ptr<T> {
public:
NonNullSharedPtr(const std::shared_ptr<T> &t)
: Base(t ? t : std::make_shared<T>()) {
- assert(t && "NonNullSharedPtr initialized from NULL shared_ptr");
+ assert(t && "NonNullSharedPtr constructed from nullptr");
}
- NonNullSharedPtr(std::shared_ptr<T> &&t)
- : Base(t ? std::move(t) : std::make_shared<T>()) {
- // Can't assert on t as it's been moved-from.
+ NonNullSharedPtr(std::shared_ptr<T> &&t) : Base(std::move(t)) {
+ assert(*this && "NonNullSharedPtr constructed from nullptr");
+ if (!t)
+ Base::operator=(std::make_shared<T>());
}
NonNullSharedPtr(const NonNullSharedPtr &other) : Base(other) {}
|
augusto2112
approved these changes
Nov 21, 2025
As suggested by Augusto, add an assert to NonNullSharedPtr move constructor.
JDevlieghere
force-pushed
the
move-ctor-assert
branch
from
f54999c to
8807e1b
Compare
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/27661 Here is the relevant piece of the build log for the reference |
aadeshps-mcw
pushed a commit
to aadeshps-mcw/llvm-project
that referenced
this pull request
Nov 26, 2025
As suggested by Augusto, add an assert to the NonNullSharedPtr move constructor.
Priyanshu3820
pushed a commit
to Priyanshu3820/llvm-project
that referenced
this pull request
Nov 26, 2025
As suggested by Augusto, add an assert to the NonNullSharedPtr move constructor.
JDevlieghere
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Dec 1, 2025
As suggested by Augusto, add an assert to the NonNullSharedPtr move constructor. (cherry picked from commit cf837e2)
augusto2112
pushed a commit
to augusto2112/llvm-project
that referenced
this pull request
Dec 3, 2025
As suggested by Augusto, add an assert to the NonNullSharedPtr move constructor.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
As suggested by Augusto, add an assert to the NonNullSharedPtr move constructor.