[NFC][Clang] Add setExprs overload to reduce some code duplication
#139749
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
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Rahul Joshi (jurahul) ChangesAdd a Full diff: https://github.com/llvm/llvm-project/pull/139749.diff 2 Files Affected:
diff --git a/clang/include/clang/AST/OpenACCClause.h b/clang/include/clang/AST/OpenACCClause.h
index fd101336acd9d..d0571e7148c3d 100644
--- a/clang/include/clang/AST/OpenACCClause.h
+++ b/clang/include/clang/AST/OpenACCClause.h
@@ -506,6 +506,14 @@ class OpenACCClauseWithExprs : public OpenACCClauseWithParams {
Exprs = NewExprs;
}
+ /// Used only for initialization, the leaf class can initialize this to
+ /// trailing storage, and initialize the data in the trailing storage as well.
+ void setExprs(MutableArrayRef<Expr *> NewExprs, ArrayRef<Expr *> Values) {
+ assert(NewExprs.size() == Values.size());
+ llvm::uninitialized_copy(Values, NewExprs.begin());
+ setExprs(NewExprs);
+ }
+
/// Gets the entire list of expressions, but leave it to the
/// individual clauses to expose this how they'd like.
llvm::ArrayRef<Expr *> getExprs() const { return Exprs; }
@@ -578,8 +586,7 @@ class OpenACCNumGangsClause final
ArrayRef<Expr *> IntExprs, SourceLocation EndLoc)
: OpenACCClauseWithExprs(OpenACCClauseKind::NumGangs, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(IntExprs, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(IntExprs.size()));
+ setExprs(getTrailingObjects<Expr *>(IntExprs.size()), IntExprs);
}
public:
@@ -607,8 +614,7 @@ class OpenACCTileClause final
ArrayRef<Expr *> SizeExprs, SourceLocation EndLoc)
: OpenACCClauseWithExprs(OpenACCClauseKind::Tile, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(SizeExprs, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(SizeExprs.size()));
+ setExprs(getTrailingObjects<Expr *>(SizeExprs.size()), SizeExprs);
}
public:
@@ -845,8 +851,7 @@ class OpenACCPrivateClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Private, BeginLoc,
LParenLoc, EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -867,8 +872,7 @@ class OpenACCFirstPrivateClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::FirstPrivate, BeginLoc,
LParenLoc, EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -889,8 +893,7 @@ class OpenACCDevicePtrClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::DevicePtr, BeginLoc,
LParenLoc, EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -911,8 +914,7 @@ class OpenACCAttachClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Attach, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -933,8 +935,7 @@ class OpenACCDetachClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Detach, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -955,8 +956,7 @@ class OpenACCDeleteClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Delete, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -977,8 +977,7 @@ class OpenACCUseDeviceClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::UseDevice, BeginLoc,
LParenLoc, EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -999,8 +998,7 @@ class OpenACCNoCreateClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::NoCreate, BeginLoc,
LParenLoc, EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1021,8 +1019,7 @@ class OpenACCPresentClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Present, BeginLoc,
LParenLoc, EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1042,8 +1039,7 @@ class OpenACCHostClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Host, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1065,8 +1061,7 @@ class OpenACCDeviceClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Device, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1093,8 +1088,7 @@ class OpenACCCopyClause final
Spelling == OpenACCClauseKind::PCopy ||
Spelling == OpenACCClauseKind::PresentOrCopy) &&
"Invalid clause kind for copy-clause");
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1127,8 +1121,7 @@ class OpenACCCopyInClause final
Spelling == OpenACCClauseKind::PCopyIn ||
Spelling == OpenACCClauseKind::PresentOrCopyIn) &&
"Invalid clause kind for copyin-clause");
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1160,8 +1153,7 @@ class OpenACCCopyOutClause final
Spelling == OpenACCClauseKind::PCopyOut ||
Spelling == OpenACCClauseKind::PresentOrCopyOut) &&
"Invalid clause kind for copyout-clause");
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1193,8 +1185,7 @@ class OpenACCCreateClause final
Spelling == OpenACCClauseKind::PCreate ||
Spelling == OpenACCClauseKind::PresentOrCreate) &&
"Invalid clause kind for create-clause");
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1223,8 +1214,7 @@ class OpenACCReductionClause final
: OpenACCClauseWithVarList(OpenACCClauseKind::Reduction, BeginLoc,
LParenLoc, EndLoc),
Op(Operator) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1249,8 +1239,7 @@ class OpenACCLinkClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::Link, BeginLoc, LParenLoc,
EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
@@ -1273,8 +1262,7 @@ class OpenACCDeviceResidentClause final
ArrayRef<Expr *> VarList, SourceLocation EndLoc)
: OpenACCClauseWithVarList(OpenACCClauseKind::DeviceResident, BeginLoc,
LParenLoc, EndLoc) {
- llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(VarList.size()));
+ setExprs(getTrailingObjects<Expr *>(VarList.size()), VarList);
}
public:
diff --git a/clang/lib/AST/OpenACCClause.cpp b/clang/lib/AST/OpenACCClause.cpp
index 447545c733050..0c141fc908820 100644
--- a/clang/lib/AST/OpenACCClause.cpp
+++ b/clang/lib/AST/OpenACCClause.cpp
@@ -166,8 +166,7 @@ OpenACCGangClause::OpenACCGangClause(SourceLocation BeginLoc,
: OpenACCClauseWithExprs(OpenACCClauseKind::Gang, BeginLoc, LParenLoc,
EndLoc) {
assert(GangKinds.size() == IntExprs.size() && "Mismatch exprs/kind?");
- llvm::uninitialized_copy(IntExprs, getTrailingObjects<Expr *>());
- setExprs(getTrailingObjects<Expr *>(IntExprs.size()));
+ setExprs(getTrailingObjects<Expr *>(IntExprs.size()), IntExprs);
llvm::uninitialized_copy(GangKinds, getTrailingObjects<OpenACCGangKind>());
}
|
erichkeane
approved these changes
May 13, 2025
jurahul
force-pushed
the
clang_openacc_setexprs
branch
from
0d19fdd to
cddc08d
Compare
erichkeane
reviewed
May 13, 2025
Add a `setExprs` overload to `OpenACCClauseWithExprs` that allows initializing the trailing storage to help eliminate some code duplication in various subclass constructors.
jurahul
force-pushed
the
clang_openacc_setexprs
branch
from
cddc08d to
44d174b
Compare
erichkeane
approved these changes
May 13, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/27/builds/10006 Here is the relevant piece of the build log for the reference |
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.
Add a
setExprsoverload toOpenACCClauseWithExprsthat allows initializing the trailing storage to help eliminate some code duplication in various subclass constructors.