Skip to content

[HLSL] add parentheses in assertion to eliminate -Wparentheses warning #128246

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 1 commit into from
Feb 21, 2025

Conversation

a-tarasyuk
Copy link
Member

Fixes #128210

@llvmbot llvmbot added clang Clang issues not falling into any other category clang:codegen IR generation bugs: mangling, exceptions, etc. HLSL HLSL Language Support labels Feb 21, 2025
@a-tarasyuk a-tarasyuk requested a review from dcb314 February 21, 2025 23:02
@llvmbot
Copy link
Member

llvmbot commented Feb 21, 2025

@llvm/pr-subscribers-hlsl

Author: Oleksandr T. (a-tarasyuk)

Changes

Fixes #128210


Full diff: https://github.com/llvm/llvm-project/pull/128246.diff

1 Files Affected:

  • (modified) clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp (+3-3)
diff --git a/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp b/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
index 1ae00023ab2bc..97262b76c0164 100644
--- a/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
@@ -89,9 +89,9 @@ llvm::TargetExtType *HLSLBufferLayoutBuilder::createLayoutType(
     RecordTypes.pop_back();
 
     for (const auto *FD : RT->getDecl()->fields()) {
-      assert(!Packoffsets || Index < Packoffsets->size() &&
-                                 "number of elements in layout struct does not "
-                                 "match number of packoffset annotations");
+      assert((!Packoffsets || Index < Packoffsets->size()) &&
+             "number of elements in layout struct does not "
+             "match number of packoffset annotations");
 
       if (!layoutField(FD, EndOffset, Layout, LayoutElements,
                        Packoffsets ? (*Packoffsets)[Index] : -1))

@llvmbot
Copy link
Member

llvmbot commented Feb 21, 2025

@llvm/pr-subscribers-clang-codegen

Author: Oleksandr T. (a-tarasyuk)

Changes

Fixes #128210


Full diff: https://github.com/llvm/llvm-project/pull/128246.diff

1 Files Affected:

  • (modified) clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp (+3-3)
diff --git a/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp b/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
index 1ae00023ab2bc..97262b76c0164 100644
--- a/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
@@ -89,9 +89,9 @@ llvm::TargetExtType *HLSLBufferLayoutBuilder::createLayoutType(
     RecordTypes.pop_back();
 
     for (const auto *FD : RT->getDecl()->fields()) {
-      assert(!Packoffsets || Index < Packoffsets->size() &&
-                                 "number of elements in layout struct does not "
-                                 "match number of packoffset annotations");
+      assert((!Packoffsets || Index < Packoffsets->size()) &&
+             "number of elements in layout struct does not "
+             "match number of packoffset annotations");
 
       if (!layoutField(FD, EndOffset, Layout, LayoutElements,
                        Packoffsets ? (*Packoffsets)[Index] : -1))

@llvmbot
Copy link
Member

llvmbot commented Feb 21, 2025

@llvm/pr-subscribers-clang

Author: Oleksandr T. (a-tarasyuk)

Changes

Fixes #128210


Full diff: https://github.com/llvm/llvm-project/pull/128246.diff

1 Files Affected:

  • (modified) clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp (+3-3)
diff --git a/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp b/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
index 1ae00023ab2bc..97262b76c0164 100644
--- a/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
@@ -89,9 +89,9 @@ llvm::TargetExtType *HLSLBufferLayoutBuilder::createLayoutType(
     RecordTypes.pop_back();
 
     for (const auto *FD : RT->getDecl()->fields()) {
-      assert(!Packoffsets || Index < Packoffsets->size() &&
-                                 "number of elements in layout struct does not "
-                                 "match number of packoffset annotations");
+      assert((!Packoffsets || Index < Packoffsets->size()) &&
+             "number of elements in layout struct does not "
+             "match number of packoffset annotations");
 
       if (!layoutField(FD, EndOffset, Layout, LayoutElements,
                        Packoffsets ? (*Packoffsets)[Index] : -1))

@a-tarasyuk a-tarasyuk merged commit 7cfab6c into llvm:main Feb 21, 2025
16 checks passed
@damyanp damyanp moved this to Closed in HLSL Support Apr 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:codegen IR generation bugs: mangling, exceptions, etc. clang Clang issues not falling into any other category HLSL HLSL Language Support
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp:92: Possible && || mixup ?
3 participants