[HLSL] Simplify debug check in ResourceBindings::addDeclBindingInfo #112661
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
Member
|
@llvm/pr-subscribers-clang Author: Helena Kotas (hekota) ChangesFollow-up for #111203 (review). Full diff: https://github.com/llvm/llvm-project/pull/112661.diff 1 Files Affected:
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
index 0d23c4935e9196..efb0fbaa432d76 100644
--- a/clang/lib/Sema/SemaHLSL.cpp
+++ b/clang/lib/Sema/SemaHLSL.cpp
@@ -110,15 +110,7 @@ DeclBindingInfo *ResourceBindings::addDeclBindingInfo(const VarDecl *VD,
ResourceClass ResClass) {
assert(getDeclBindingInfo(VD, ResClass) == nullptr &&
"DeclBindingInfo already added");
-#ifndef NDEBUG
- // Verify that existing bindings for this decl are stored sequentially
- // and at the end of the BindingsList
- auto I = DeclToBindingListIndex.find(VD);
- if (I != DeclToBindingListIndex.end()) {
- for (unsigned Index = I->getSecond(); Index < BindingsList.size(); ++Index)
- assert(BindingsList[Index].Decl == VD);
- }
-#endif
+ assert(!hasBindingInfoForDecl(VD) || BindingsList.back().Decl == VD);
// VarDecl may have multiple entries for different resource classes.
// DeclToBindingListIndex stores the index of the first binding we saw
// for this decl. If there are any additional ones then that index
|
Member
|
@llvm/pr-subscribers-hlsl Author: Helena Kotas (hekota) ChangesFollow-up for #111203 (review). Full diff: https://github.com/llvm/llvm-project/pull/112661.diff 1 Files Affected:
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
index 0d23c4935e9196..efb0fbaa432d76 100644
--- a/clang/lib/Sema/SemaHLSL.cpp
+++ b/clang/lib/Sema/SemaHLSL.cpp
@@ -110,15 +110,7 @@ DeclBindingInfo *ResourceBindings::addDeclBindingInfo(const VarDecl *VD,
ResourceClass ResClass) {
assert(getDeclBindingInfo(VD, ResClass) == nullptr &&
"DeclBindingInfo already added");
-#ifndef NDEBUG
- // Verify that existing bindings for this decl are stored sequentially
- // and at the end of the BindingsList
- auto I = DeclToBindingListIndex.find(VD);
- if (I != DeclToBindingListIndex.end()) {
- for (unsigned Index = I->getSecond(); Index < BindingsList.size(); ++Index)
- assert(BindingsList[Index].Decl == VD);
- }
-#endif
+ assert(!hasBindingInfoForDecl(VD) || BindingsList.back().Decl == VD);
// VarDecl may have multiple entries for different resource classes.
// DeclToBindingListIndex stores the index of the first binding we saw
// for this decl. If there are any additional ones then that index
|
bob80905
approved these changes
Oct 17, 2024
damyanp
approved these changes
Oct 17, 2024
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.
Follow-up for #111203 (review).