Skip to content

Add clang::lifetimebound annotation to ArrayRef constructors. #113547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions llvm/include/llvm/ADT/ArrayRef.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,16 @@ namespace llvm {
/*implicit*/ ArrayRef(std::nullopt_t) {}

/// Construct an ArrayRef from a single element.
/*implicit*/ ArrayRef(const T &OneElt)
: Data(&OneElt), Length(1) {}
/*implicit*/ ArrayRef(const T &OneElt LLVM_LIFETIME_BOUND)
: Data(&OneElt), Length(1) {}

/// Construct an ArrayRef from a pointer and length.
constexpr /*implicit*/ ArrayRef(const T *data, size_t length)
constexpr /*implicit*/ ArrayRef(const T *data LLVM_LIFETIME_BOUND,
size_t length)
: Data(data), Length(length) {}

/// Construct an ArrayRef from a range.
constexpr ArrayRef(const T *begin, const T *end)
constexpr ArrayRef(const T *begin LLVM_LIFETIME_BOUND, const T *end)
: Data(begin), Length(end - begin) {
assert(begin <= end);
}
Expand All @@ -103,7 +104,8 @@ namespace llvm {

/// Construct an ArrayRef from a C array.
template <size_t N>
/*implicit*/ constexpr ArrayRef(const T (&Arr)[N]) : Data(Arr), Length(N) {}
/*implicit*/ constexpr ArrayRef(const T (&Arr LLVM_LIFETIME_BOUND)[N])
: Data(Arr), Length(N) {}

/// Construct an ArrayRef from a std::initializer_list.
#if LLVM_GNUC_PREREQ(9, 0, 0)
Expand All @@ -113,7 +115,8 @@ namespace llvm {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Winit-list-lifetime"
#endif
constexpr /*implicit*/ ArrayRef(std::initializer_list<T> Vec)
constexpr /*implicit*/ ArrayRef(
std::initializer_list<T> Vec LLVM_LIFETIME_BOUND)
: Data(Vec.begin() == Vec.end() ? (T *)nullptr : Vec.begin()),
Length(Vec.size()) {}
#if LLVM_GNUC_PREREQ(9, 0, 0)
Expand Down
6 changes: 6 additions & 0 deletions llvm/include/llvm/Support/Compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,12 @@
#define LLVM_GSL_POINTER
#endif

#if LLVM_HAS_CPP_ATTRIBUTE(clang::lifetimebound)
#define LLVM_LIFETIME_BOUND [[clang::lifetimebound]]
#else
#define LLVM_LIFETIME_BOUND
#endif

#if LLVM_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L
#define LLVM_CTOR_NODISCARD [[nodiscard]]
#else
Expand Down
Loading