Author: Rahul Joshi Date: 2024-08-28T17:41:43-07:00 New Revision: b75fe11fd6fe751157012a8881ece2f247bd3887
URL: https://github.com/llvm/llvm-project/commit/b75fe11fd6fe751157012a8881ece2f247bd3887 DIFF: https://github.com/llvm/llvm-project/commit/b75fe11fd6fe751157012a8881ece2f247bd3887.diff LOG: [NFC] Fix formatv() usage in preparation of validation (#106454) Fix several uses of formatv() that would be flagged as invalid by an upcoming change that will add additional validation to formatv(). Added: Modified: clang/lib/StaticAnalyzer/Checkers/CheckPlacementNew.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp llvm/tools/llvm-pdbutil/ExplainOutputStyle.cpp llvm/utils/TableGen/IntrinsicEmitter.cpp mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp mlir/tools/mlir-tblgen/LLVMIRConversionGen.cpp mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp mlir/tools/mlir-tblgen/OpFormatGen.cpp mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp Removed: ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Checkers/CheckPlacementNew.cpp b/clang/lib/StaticAnalyzer/Checkers/CheckPlacementNew.cpp index 99e11a15c08dc2..1b89951397cfb1 100644 --- a/clang/lib/StaticAnalyzer/Checkers/CheckPlacementNew.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/CheckPlacementNew.cpp @@ -131,7 +131,7 @@ bool PlacementNewChecker::checkPlaceCapacityIsSufficient( "Storage provided to placement new is only {0} bytes, " "whereas the allocated array type requires more space for " "internal needs", - SizeOfPlaceCI->getValue(), SizeOfTargetCI->getValue())); + SizeOfPlaceCI->getValue())); else Msg = std::string(llvm::formatv( "Storage provided to placement new is only {0} bytes, " diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp index d1d91134b6237c..0eb882b0e7d4f5 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp @@ -655,7 +655,7 @@ DWARFUnit::GetDIE(dw_offset_t die_offset) { if (!ContainsDIEOffset(die_offset)) { GetSymbolFileDWARF().GetObjectFile()->GetModule()->ReportError( - "GetDIE for DIE {0:x16} is outside of its CU {0:x16}", die_offset, + "GetDIE for DIE {0:x16} is outside of its CU {1:x16}", die_offset, GetOffset()); return DWARFDIE(); // Not found } diff --git a/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp b/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp index 77e8ece9439cf9..eb2751ab30ac50 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp @@ -1518,8 +1518,7 @@ DWARFVerifier::verifyNameIndexAbbrevs(const DWARFDebugNames::NameIndex &NI) { error() << formatv("NameIndex @ {0:x}: Indexing multiple compile units " "and abbreviation {1:x} has no DW_IDX_compile_unit " "or DW_IDX_type_unit attribute.\n", - NI.getUnitOffset(), Abbrev.Code, - dwarf::DW_IDX_compile_unit); + NI.getUnitOffset(), Abbrev.Code); }); ++NumErrors; } diff --git a/llvm/tools/llvm-pdbutil/ExplainOutputStyle.cpp b/llvm/tools/llvm-pdbutil/ExplainOutputStyle.cpp index ce9d659335b30b..200e9037de3cbe 100644 --- a/llvm/tools/llvm-pdbutil/ExplainOutputStyle.cpp +++ b/llvm/tools/llvm-pdbutil/ExplainOutputStyle.cpp @@ -139,8 +139,8 @@ bool ExplainOutputStyle::explainPdbBlockStatus() { FileOffset, File.pdb().getFileSize()); return false; } - P.formatLine("Block:Offset = {2:X-}:{1:X-4}.", FileOffset, pdbBlockOffset(), - pdbBlockIndex()); + P.formatLine("Block:Offset = {0:X-}:{1:X-4}.", pdbBlockIndex(), + pdbBlockOffset()); bool IsFree = File.pdb().getMsfLayout().FreePageMap[pdbBlockIndex()]; P.formatLine("Address is in block {0} ({1}allocated).", pdbBlockIndex(), diff --git a/llvm/utils/TableGen/IntrinsicEmitter.cpp b/llvm/utils/TableGen/IntrinsicEmitter.cpp index 4c211cdca84c5f..af8ff889918428 100644 --- a/llvm/utils/TableGen/IntrinsicEmitter.cpp +++ b/llvm/utils/TableGen/IntrinsicEmitter.cpp @@ -735,8 +735,8 @@ Intrinsic::getIntrinsicFor{1}Builtin(StringRef TargetPrefix, const auto &[Map, CommonPrefix] = Entry; if (TargetPrefix.empty()) continue; - OS << formatv(R"( {{"{0}", {0}Names, "{2}"},)", TargetPrefix, - TargetPrefix, CommonPrefix) + OS << formatv(R"( {{"{0}", {0}Names, "{1}"},)", TargetPrefix, + CommonPrefix) << "\n"; } OS << " };\n"; diff --git a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp index 7311cdd39d0755..a00f12661f7120 100644 --- a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp +++ b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp @@ -634,7 +634,7 @@ ArrayAttr {0}::getIndexingMaps() {{ MLIRContext *context = getContext(); auto symbolBindings = getSymbolBindings(*this); SmallVector<AffineMap> maps; - {2} + {1} cached = Builder(context).getAffineMapArrayAttr(maps); getOperation()->setAttr(memoizeAttr, cached); return cached; @@ -929,7 +929,7 @@ exprs.push_back(getAffineConstantExpr(cst{1}, context)); // TODO: This needs to be memoized and/or converted to non-parser based // C++ codegen prior to real use. os << llvm::formatv(structuredOpIndexingMapsFormat, className, - dimIdentsStr, interleaveToString(stmts, "\n ")); + interleaveToString(stmts, "\n ")); } } else { os << llvm::formatv(rankPolyStructuredOpIndexingMapsFormat, className); diff --git a/mlir/tools/mlir-tblgen/LLVMIRConversionGen.cpp b/mlir/tools/mlir-tblgen/LLVMIRConversionGen.cpp index ebadfe4499a54d..5560298831865f 100644 --- a/mlir/tools/mlir-tblgen/LLVMIRConversionGen.cpp +++ b/mlir/tools/mlir-tblgen/LLVMIRConversionGen.cpp @@ -519,7 +519,7 @@ static void emitOneCEnumFromConversion(const llvm::Record *record, os << formatv( "inline LLVM_ATTRIBUTE_UNUSED {0}::{1} convert{1}FromLLVM(int64_t " "value) {{\n", - cppNamespace, cppClassName, llvmClass); + cppNamespace, cppClassName); os << " switch (value) {\n"; for (const auto &enumerant : enumAttr.getAllCases()) { diff --git a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp index 66dbb16760ebb0..572c1545b43fcb 100644 --- a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp +++ b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp @@ -1378,7 +1378,7 @@ void OpEmitter::genPropertiesSupport() { ::llvm::function_ref<::mlir::InFlightDiagnostic()> emitError) -> ::mlir::LogicalResult {{ {0} }; - {2}; + {1}; )decl"; const char *attrGetNoDefaultFmt = R"decl(; if (attr && ::mlir::failed(setFromAttr(prop.{0}, attr, emitError))) @@ -1419,7 +1419,7 @@ void OpEmitter::genPropertiesSupport() { &fctx.addSubst("_attr", propertyAttr) .addSubst("_storage", propertyStorage) .addSubst("_diag", propertyDiag)), - name, getAttr); + getAttr); if (prop.hasStorageTypeValueOverride()) { setPropMethod << formatv(attrGetDefaultFmt, name, prop.getStorageTypeValueOverride()); @@ -2768,11 +2768,10 @@ void OpEmitter::genInferredTypeCollectiveParamBuilder() { << "u && \"mismatched number of return types\");"; body << "\n " << builderOpState << ".addTypes(inferredReturnTypes);"; - body << formatv(R"( - } else {{ + body << R"( + } else { ::llvm::report_fatal_error("Failed to infer result type(s)."); - })", - opClass.getClassName(), builderOpState); + })"; } void OpEmitter::genUseOperandAsResultTypeSeparateParamBuilder() { @@ -3882,7 +3881,7 @@ void OpEmitter::genSuccessorVerifier(MethodBody &body) { auto getSuccessor = formatv(successor.isVariadic() ? "{0}()" : getSingleSuccessor, - successor.name, it.index()) + successor.name) .str(); auto constraintFn = staticVerifierEmitter.getSuccessorConstraintFn(successor.constraint); diff --git a/mlir/tools/mlir-tblgen/OpFormatGen.cpp b/mlir/tools/mlir-tblgen/OpFormatGen.cpp index 9a95f495b77658..82f8718fc556ad 100644 --- a/mlir/tools/mlir-tblgen/OpFormatGen.cpp +++ b/mlir/tools/mlir-tblgen/OpFormatGen.cpp @@ -1122,7 +1122,7 @@ static void genCustomDirectiveParser(CustomDirective *dir, MethodBody &body, " {0}Operands.append(subRange.begin(), subRange.end());\n" " {0}OperandGroupSizes.push_back(subRange.size());\n" " }\n", - var->name, var->constraint.getVariadicOfVariadicSegmentSizeAttr()); + var->name); } } else if (auto *dir = dyn_cast<TypeDirective>(param)) { ArgumentLengthKind lengthKind; @@ -1575,9 +1575,7 @@ void OperationFormat::genElementParser(FormatElement *element, MethodBody &body, ArgumentLengthKind lengthKind = getArgumentLengthKind(operand->getVar()); StringRef name = operand->getVar()->name; if (lengthKind == ArgumentLengthKind::VariadicOfVariadic) - body << llvm::formatv( - variadicOfVariadicOperandParserCode, name, - operand->getVar()->constraint.getVariadicOfVariadicSegmentSizeAttr()); + body << llvm::formatv(variadicOfVariadicOperandParserCode, name); else if (lengthKind == ArgumentLengthKind::Variadic) body << llvm::formatv(variadicOperandParserCode, name); else if (lengthKind == ArgumentLengthKind::Optional) diff --git a/mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp b/mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp index 9aeb14d14eeca5..ec211ad3519ce3 100644 --- a/mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp +++ b/mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp @@ -780,8 +780,7 @@ static void emitSerializationFunction(const Record *attrClass, os << formatv(" (void)emitDebugLine(functionBody, {0}.getLoc());\n", opVar); os << formatv(" (void)encodeInstructionInto(" - "functionBody, spirv::Opcode::{1}, {2});\n", - op.getQualCppClassName(), + "functionBody, spirv::Opcode::{0}, {1});\n", record->getValueAsString("spirvOpName"), operands); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
