[OpenACC] Ensure ArrayRef and SmallVector are kept in sync. #163273
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
My OpenACCReductionRecipeWithStorage attempted to get its allocations in sync with the ArrayRef so I could use the arrayref to refer to the allocation. Unfortunately I'd forgotten about the move constructor, which made it get out of sync, which Asan caught.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Erich Keane (erichkeane) ChangesMy OpenACCReductionRecipeWithStorage attempted to get its allocations in sync with the ArrayRef so I could use the arrayref to refer to the allocation. Unfortunately I'd forgotten about the move constructor, Full diff: https://github.com/llvm/llvm-project/pull/163273.diff 1 Files Affected:
diff --git a/clang/include/clang/AST/OpenACCClause.h b/clang/include/clang/AST/OpenACCClause.h
index 379495c658825..1e351f31f4b92 100644
--- a/clang/include/clang/AST/OpenACCClause.h
+++ b/clang/include/clang/AST/OpenACCClause.h
@@ -1311,13 +1311,37 @@ struct OpenACCReductionRecipe {
// the OpenACCReductionClause node has been created. This one has storage for
// the CombinerRecipe, since Trailing storage for it doesn't exist yet.
struct OpenACCReductionRecipeWithStorage : OpenACCReductionRecipe {
+private:
llvm::SmallVector<CombinerRecipe, 1> CombinerRecipeStorage;
+public:
OpenACCReductionRecipeWithStorage(VarDecl *A,
llvm::ArrayRef<CombinerRecipe> Combiners)
: OpenACCReductionRecipe(A, {}), CombinerRecipeStorage(Combiners) {
CombinerRecipes = CombinerRecipeStorage;
}
+
+ OpenACCReductionRecipeWithStorage(
+ const OpenACCReductionRecipeWithStorage &Other)
+ : OpenACCReductionRecipe(Other),
+ CombinerRecipeStorage(Other.CombinerRecipeStorage) {
+ CombinerRecipes = CombinerRecipeStorage;
+ }
+
+ OpenACCReductionRecipeWithStorage(OpenACCReductionRecipeWithStorage &&Other)
+ : OpenACCReductionRecipe(std::move(Other)),
+ CombinerRecipeStorage(std::move(Other.CombinerRecipeStorage)) {
+ CombinerRecipes = CombinerRecipeStorage;
+ }
+
+ // There is no real problem implementing these, we just have to make sure the
+ // array-ref this inherits from stays in sync. But as we don't need it at the
+ // moment, make sure we don't accidentially call these.
+ OpenACCReductionRecipeWithStorage &
+ operator=(OpenACCReductionRecipeWithStorage &&) = delete;
+ OpenACCReductionRecipeWithStorage &
+ operator=(const OpenACCReductionRecipeWithStorage &) = delete;
+
static OpenACCReductionRecipeWithStorage Empty() {
return OpenACCReductionRecipeWithStorage(/*AllocaDecl=*/nullptr, {});
}
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/27/builds/17456 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/65/builds/23954 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
3 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.
My OpenACCReductionRecipeWithStorage attempted to get its allocations in sync with the ArrayRef so I could use the arrayref to refer to the allocation. Unfortunately I'd forgotten about the move constructor,
which made it get out of sync, which Asan caught.