[llvm] Add clang::lifetimebound annotation to ArrayRef constructors. (PR #113547)
Haojian Wu via llvm-commits
llvm-commits at lists.llvm.org
Thu Oct 24 05:23:36 PDT 2024
https://github.com/hokein updated https://github.com/llvm/llvm-project/pull/113547
>From 57ed7711c3c09e8c99b37d88e4002a696cba1338 Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu at gmail.com>
Date: Thu, 24 Oct 2024 12:12:37 +0200
Subject: [PATCH 1/2] Add clang::lifetimebound annotation to ArrayRef
constructors.
---
llvm/include/llvm/ADT/ArrayRef.h | 5 +++--
llvm/include/llvm/Support/Compiler.h | 6 ++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/llvm/include/llvm/ADT/ArrayRef.h b/llvm/include/llvm/ADT/ArrayRef.h
index d9897320ce091a..1a2a8a307a2995 100644
--- a/llvm/include/llvm/ADT/ArrayRef.h
+++ b/llvm/include/llvm/ADT/ArrayRef.h
@@ -70,7 +70,7 @@ namespace llvm {
/*implicit*/ ArrayRef(std::nullopt_t) {}
/// Construct an ArrayRef from a single element.
- /*implicit*/ ArrayRef(const T &OneElt)
+ /*implicit*/ ArrayRef(const T &OneElt LLVM_LIFETIME_BOUND)
: Data(&OneElt), Length(1) {}
/// Construct an ArrayRef from a pointer and length.
@@ -103,7 +103,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)
diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h
index 591e7647795bb2..3b03c2851a4214 100644
--- a/llvm/include/llvm/Support/Compiler.h
+++ b/llvm/include/llvm/Support/Compiler.h
@@ -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_LLVM_LIFETIME_BOUND
+#endif
+
#if LLVM_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L
#define LLVM_CTOR_NODISCARD [[nodiscard]]
#else
>From 907a185ae273b6f7b6aa64d7df86b3bd0cd93728 Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu at gmail.com>
Date: Thu, 24 Oct 2024 14:22:23 +0200
Subject: [PATCH 2/2] Annotate more constructors.
---
llvm/include/llvm/ADT/ArrayRef.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/llvm/include/llvm/ADT/ArrayRef.h b/llvm/include/llvm/ADT/ArrayRef.h
index 1a2a8a307a2995..4957e1b1f96da4 100644
--- a/llvm/include/llvm/ADT/ArrayRef.h
+++ b/llvm/include/llvm/ADT/ArrayRef.h
@@ -71,14 +71,15 @@ namespace llvm {
/// Construct an ArrayRef from a single element.
/*implicit*/ ArrayRef(const T &OneElt LLVM_LIFETIME_BOUND)
- : Data(&OneElt), Length(1) {}
+ : 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);
}
@@ -114,7 +115,8 @@ namespace llvm {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Winit-list-lifetime"
#endif
- constexpr /*implicit*/ ArrayRef(const std::initializer_list<T> &Vec)
+ constexpr /*implicit*/ ArrayRef(
+ const 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)
More information about the llvm-commits
mailing list