Skip to content

Commit 6db244a

Browse files
authored
Add parentheses to clarify operator ordering in asserts. NFC. (#159333)
This avoids the following kind of warning with GCC: ../tools/llvm-lipo/llvm-lipo.cpp: In function ‘void printInfo(llvm::LLVMContext&, llvm::ArrayRef<llvm::object::OwningBinary<llvm::object::Binary> >)’: ../tools/llvm-lipo/llvm-lipo.cpp:464:34: warning: suggest parentheses around ‘& ’ within ‘||’ [-Wparentheses] 464 | Binary->isArchive() && "expected MachO binary"); | ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
1 parent 95f213f commit 6db244a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

clang/lib/CodeGen/CGHLSLRuntime.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -922,9 +922,9 @@ void CGHLSLRuntime::emitInitListOpaqueValues(CodeGenFunction &CGF,
922922

923923
std::optional<LValue> CGHLSLRuntime::emitResourceArraySubscriptExpr(
924924
const ArraySubscriptExpr *ArraySubsExpr, CodeGenFunction &CGF) {
925-
assert(ArraySubsExpr->getType()->isHLSLResourceRecord() ||
926-
ArraySubsExpr->getType()->isHLSLResourceRecordArray() &&
927-
"expected resource array subscript expression");
925+
assert((ArraySubsExpr->getType()->isHLSLResourceRecord() ||
926+
ArraySubsExpr->getType()->isHLSLResourceRecordArray()) &&
927+
"expected resource array subscript expression");
928928

929929
// Let clang codegen handle local resource array subscripts,
930930
// or when the subscript references on opaque expression (as part of

llvm/tools/llvm-lipo/llvm-lipo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,8 @@ printInfo(LLVMContext &LLVMCtx, ArrayRef<OwningBinary<Binary>> InputBinaries) {
460460
for (auto &IB : InputBinaries) {
461461
const Binary *Binary = IB.getBinary();
462462
if (!Binary->isMachOUniversalBinary()) {
463-
assert(Binary->isMachO() ||
464-
Binary->isArchive() && "expected MachO binary");
463+
assert((Binary->isMachO() || Binary->isArchive()) &&
464+
"expected MachO binary");
465465
outs() << "Non-fat file: " << Binary->getFileName()
466466
<< " is architecture: ";
467467
printBinaryArchs(LLVMCtx, Binary, outs());

0 commit comments

Comments
 (0)