Skip to content

Commit d6b8f58

Browse files
committed
eliminating g++ warnings
1 parent f03b783 commit d6b8f58

File tree

15 files changed

+32
-15
lines changed

15 files changed

+32
-15
lines changed

llvm/include/llvm/BinaryFormat/MachO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@ CPU_SUBTYPE_ARM64E_WITH_PTRAUTH_VERSION(unsigned PtrAuthABIVersion,
16621662
"ptrauth abi version must fit in 4 bits");
16631663
return CPU_SUBTYPE_ARM64E | CPU_SUBTYPE_ARM64E_VERSIONED_PTRAUTH_ABI_MASK |
16641664
(PtrAuthKernelABIVersion ? CPU_SUBTYPE_ARM64E_KERNEL_PTRAUTH_ABI_MASK
1665-
: 0) |
1665+
: static_cast<CPUSubTypeARM64>(0)) |
16661666
(PtrAuthABIVersion << 24);
16671667
}
16681668

mlir/include/mlir/IR/OpDefinition.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,8 @@ foldTrait(Operation *, ArrayRef<Attribute>, SmallVectorImpl<OpFoldResult> &) {
15931593
/// Given a tuple type containing a set of traits, return the result of folding
15941594
/// the given operation.
15951595
template <typename... Ts>
1596-
static LogicalResult foldTraits(Operation *op, ArrayRef<Attribute> operands,
1596+
static LogicalResult foldTraits([[maybe_unused]] Operation *op,
1597+
[[maybe_unused]] ArrayRef<Attribute> operands,
15971598
SmallVectorImpl<OpFoldResult> &results) {
15981599
return success((succeeded(foldTrait<Ts>(op, operands, results)) || ...));
15991600
}
@@ -1629,7 +1630,7 @@ verifyTrait(Operation *) {
16291630

16301631
/// Given a set of traits, return the result of verifying the given operation.
16311632
template <typename... Ts>
1632-
LogicalResult verifyTraits(Operation *op) {
1633+
LogicalResult verifyTraits([[maybe_unused]] Operation *op) {
16331634
return success((succeeded(verifyTrait<Ts>(op)) && ...));
16341635
}
16351636

@@ -1649,7 +1650,7 @@ verifyRegionTrait(Operation *) {
16491650
/// Given a set of traits, return the result of verifying the regions of the
16501651
/// given operation.
16511652
template <typename... Ts>
1652-
LogicalResult verifyRegionTraits(Operation *op) {
1653+
LogicalResult verifyRegionTraits([[maybe_unused]] Operation *op) {
16531654
return success((succeeded(verifyRegionTrait<Ts>(op)) && ...));
16541655
}
16551656
} // namespace op_definition_impl

mlir/include/mlir/Pass/Pass.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class Pass {
9494
Option(Pass &parent, StringRef arg, Args &&...args)
9595
: detail::PassOptions::Option<DataType, OptionParser>(
9696
parent.passOptions, arg, std::forward<Args>(args)...) {}
97+
Option &operator=(const Option &other) = default; // gcc11
9798
using detail::PassOptions::Option<DataType, OptionParser>::operator=;
9899
};
99100
/// This class represents a specific pass option that contains a list of

mlir/include/mlir/Query/Matcher/Marshallers.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,10 @@ inline bool checkArgTypeAtIndex(llvm::StringRef matcherName,
150150

151151
// Marshaller function for fixed number of arguments
152152
template <typename ReturnType, typename... ArgTypes, size_t... Is>
153-
static VariantMatcher
154-
matcherMarshallFixedImpl(void (*matcherFunc)(), llvm::StringRef matcherName,
155-
SourceRange nameRange,
156-
llvm::ArrayRef<ParserValue> args, Diagnostics *error,
157-
std::index_sequence<Is...>) {
153+
static VariantMatcher matcherMarshallFixedImpl(
154+
void (*matcherFunc)(), [[maybe_unused]] llvm::StringRef matcherName,
155+
SourceRange nameRange, llvm::ArrayRef<ParserValue> args, Diagnostics *error,
156+
std::index_sequence<Is...>) {
158157
using FuncType = ReturnType (*)(ArgTypes...);
159158

160159
// Check if the argument count matches the expected count

mlir/lib/Analysis/FlatLinearValueConstraints.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ FlatLinearValueConstraints::FlatLinearValueConstraints(IntegerSet set,
893893
set.getNumDims(), set.getNumSymbols(),
894894
/*numLocals=*/0) {
895895
assert(operands.empty() ||
896-
set.getNumInputs() == operands.size() && "operand count mismatch");
896+
(set.getNumInputs() == operands.size() && "operand count mismatch"));
897897
// Set the values for the non-local variables.
898898
for (unsigned i = 0, e = operands.size(); i < e; ++i)
899899
setValue(i, operands[i]);

mlir/lib/CAPI/IR/IR.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,8 @@ static mlir::WalkResult unwrap(MlirWalkResult result) {
736736
case MlirWalkResultSkip:
737737
return mlir::WalkResult::skip();
738738
}
739+
assert("unknown result in WalkResult::unwrap" == nullptr);
740+
return {};
739741
}
740742

741743
void mlirOperationWalk(MlirOperation op, MlirOperationWalkCallback callback,

mlir/lib/Conversion/ArmSMEToLLVM/ArmSMEToLLVM.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ static Operation *createLoadTileSliceIntrinsic(
8080
break;
8181
}
8282
}
83+
assert("unknown type in createLoadTileSliceIntrinsic" == nullptr);
84+
return nullptr;
8385
}
8486

8587
/// Helper to create an arm_sme.intr.st1*.(horiz|vert)' intrinsic.
@@ -124,6 +126,8 @@ static Operation *createStoreTileSliceIntrinsic(
124126
loc, maskOp, ptr, tileId, tileSliceI32);
125127
}
126128
}
129+
assert("unknown type in createStoreTileSliceIntrinsic" == nullptr);
130+
return nullptr;
127131
}
128132

129133
IntegerAttr getTileIdOrError(arm_sme::ArmSMETileOpInterface op) {
@@ -848,6 +852,8 @@ struct StreamingVLOpConversion
848852
case arm_sme::TypeSize::Double:
849853
return rewriter.create<arm_sme::aarch64_sme_cntsd>(loc, i64Type);
850854
}
855+
assert("unknown type in StreamingVLOpConversion" == nullptr);
856+
return nullptr;
851857
}();
852858
rewriter.replaceOpWithNewOp<arith::IndexCastOp>(
853859
streamingVlOp, rewriter.getIndexType(), intrOp->getResult(0));

mlir/lib/Conversion/IndexToSPIRV/IndexToSPIRV.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ struct ConvertIndexCmpPattern final : OpConversionPattern<CmpOp> {
310310
case IndexCmpPredicate::ULT:
311311
return rewriteCmpOp<spirv::ULessThanOp>(op, adaptor, rewriter);
312312
}
313+
assert("Unknown predicate in ConvertIndexCmpPattern" == nullptr);
314+
return failure();
313315
}
314316
};
315317

mlir/lib/Debug/DebuggerExecutionContextHook.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ void mlirDebuggerAddFileLineColLocBreakpoint(const char *file, int line,
301301

302302
LLVM_ATTRIBUTE_NOINLINE void mlirDebuggerBreakpointHook() {
303303
static LLVM_THREAD_LOCAL void *volatile sink;
304-
sink = (void *)&sink;
304+
sink = (void *)const_cast<void **>(&sink);
305305
}
306306

307307
static void preventLinkerDeadCodeElim() {
@@ -321,7 +321,7 @@ static void preventLinkerDeadCodeElim() {
321321
sink = (void *)mlirDebuggerAddTagBreakpoint;
322322
sink = (void *)mlirDebuggerAddRewritePatternBreakpoint;
323323
sink = (void *)mlirDebuggerAddFileLineColLocBreakpoint;
324-
sink = (void *)&sink;
324+
sink = (void *)const_cast<void **>(&sink);
325325
return true;
326326
}();
327327
(void)initialized;

mlir/lib/Dialect/AMDGPU/IR/AMDGPUDialect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ LogicalResult DPPOp::verify() {
347347
return emitOpError("quad_perm attribute must have exactly 4 elements");
348348
}
349349
for (auto elem : quadPermAttr.getAsRange<IntegerAttr>()) {
350-
uint32_t num = elem.getInt();
350+
int32_t num = elem.getInt();
351351
if (num < 0 || num > 3) {
352352
return emitOpError(
353353
"Each element of quad_perm must be in the range [0, 3]");

mlir/lib/Dialect/ArmSME/Transforms/TileAllocation.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ static ArrayRef<TileMask> getMasks(ArmSMETileType type) {
137137
case ArmSMETileType::ZAQ:
138138
return ZA_Q_MASKS;
139139
}
140+
assert("unknown type in getMasks" == nullptr);
141+
return {};
140142
}
141143

142144
class TileAllocator {

mlir/lib/Dialect/Async/Transforms/AsyncParallelFor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ ArrayRef<BlockArgument> ParallelComputeFunctionArgs::lowerBounds() {
175175
return args.drop_front(2 + 1 * numLoops).take_front(numLoops);
176176
}
177177

178+
[[maybe_unused]]
178179
ArrayRef<BlockArgument> ParallelComputeFunctionArgs::upperBounds() {
179180
return args.drop_front(2 + 2 * numLoops).take_front(numLoops);
180181
}

mlir/lib/Dialect/Index/IR/IndexOps.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,8 @@ static bool compareSameArgs(IndexCmpPredicate pred) {
594594
case IndexCmpPredicate::ULT:
595595
return false;
596596
}
597+
assert("unknown predicate in compareSameArgs" == nullptr);
598+
return {};
597599
}
598600

599601
OpFoldResult CmpOp::fold(FoldAdaptor adaptor) {

mlir/unittests/Bytecode/BytecodeTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ TEST(Bytecode, MultiModuleWithResource) {
5555
constexpr size_t kAlignment = 0x20;
5656
size_t bufferSize = buffer.size();
5757
buffer.reserve(bufferSize + kAlignment - 1);
58-
size_t pad = ~(uintptr_t)buffer.data() + 1 & kAlignment - 1;
58+
size_t pad = (~(uintptr_t)buffer.data() + 1) & (kAlignment - 1);
5959
buffer.insert(0, pad, ' ');
6060
StringRef alignedBuffer(buffer.data() + pad, bufferSize);
6161

mlir/unittests/Support/CyclicReplacerCacheTest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,8 @@ class CachedCyclicReplacerGraphReplacement : public ::testing::Test {
225225
/// Add a recursive-self-node, i.e. a duplicate of the original node that is
226226
/// meant to represent an indirection to it.
227227
std::pair<Node, int64_t> addRecursiveSelfNode(Graph::Node originalId) {
228-
return {addNode(originalId, nextRecursionId), nextRecursionId++};
228+
auto node = addNode(originalId, nextRecursionId);
229+
return {node, nextRecursionId++};
229230
}
230231
void addEdge(Node src, Node sink) { connections.addEdge(src, sink); }
231232

0 commit comments

Comments
 (0)