[NFC] Fix Parens on assertion from 147514

[erichkeane]

As brought up on the review for #147514, the original patch doesn't correctly parenthesize the expression in the assert. This fixes it.

[llvmbot]

@llvm/pr-subscribers-clang

Author: Erich Keane (erichkeane)

Changes

As brought up on the review for #147514, the original patch doesn't correctly parenthesize the expression in the assert. This fixes it.

---

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

1 Files Affected:

• (modified) clang/lib/CodeGen/CGExprScalar.cpp (+3-3)

diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index ce483c5cc4e45..4fa25c5d66669 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -2142,9 +2142,9 @@ Value *ScalarExprEmitter::VisitInitListExpr(InitListExpr *E) {
   bool Ignore = TestAndClearIgnoreResultAssign();
   (void)Ignore;
   unsigned NumInitElements = E->getNumInits();
-  assert(Ignore == false ||
-         (NumInitElements == 0 && E->getType()->isVoidType()) &&
-             "init list ignored");
+  assert((Ignore == false ||
+          (NumInitElements == 0 && E->getType()->isVoidType())) &&
+         "init list ignored");
 
   // HLSL initialization lists in the AST are an expansion which can contain
   // side-effecting expressions wrapped in opaque value expressions. To properly

[llvmbot]

@llvm/pr-subscribers-clang-codegen

Author: Erich Keane (erichkeane)

Changes

As brought up on the review for #147514, the original patch doesn't correctly parenthesize the expression in the assert. This fixes it.

---

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

1 Files Affected:

• (modified) clang/lib/CodeGen/CGExprScalar.cpp (+3-3)

diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index ce483c5cc4e45..4fa25c5d66669 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -2142,9 +2142,9 @@ Value *ScalarExprEmitter::VisitInitListExpr(InitListExpr *E) {
   bool Ignore = TestAndClearIgnoreResultAssign();
   (void)Ignore;
   unsigned NumInitElements = E->getNumInits();
-  assert(Ignore == false ||
-         (NumInitElements == 0 && E->getType()->isVoidType()) &&
-             "init list ignored");
+  assert((Ignore == false ||
+          (NumInitElements == 0 && E->getType()->isVoidType())) &&
+         "init list ignored");
 
   // HLSL initialization lists in the AST are an expansion which can contain
   // side-effecting expressions wrapped in opaque value expressions. To properly

[brunodf-snps]

Thanks for picking this up!

[brunodf-snps]

The following alternative is perhaps more clear, and allows to remove the (void)Ignore line from just above.

Suggested change

	assert((Ignore == false ||
	(NumInitElements == 0 && E->getType()->isVoidType())) &&
	"init list ignored");
	if (Ignore)
	assert(NumInitElements == 0 && E->getType()->isVoidType()
	&& "only ignore irrelevant init list");

[erichkeane]

That version ends up having a weird dead branch in non-asserts builds, and is problematic as assert is a macro. I don't see the losing the cast as worth the additional risk/breaking up the purpose of the assert here, so I'm going to leave it.

[brunodf-snps]

OK, good to me. The extra parentheses solve the GCC warning.