From 984b800a036fc61ccb129a8da7592af9cadc94dd Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Mon, 9 Jan 2023 18:11:07 +0100 Subject: [PATCH] Move from llvm::makeArrayRef to ArrayRef deduction guides - last part This is a follow-up to https://reviews.llvm.org/D140896, split into several parts as it touches a lot of files. Differential Revision: https://reviews.llvm.org/D141298 --- bolt/tools/bat-dump/bat-dump.cpp | 2 +- bolt/tools/driver/llvm-bolt.cpp | 6 ++--- bolt/tools/heatmap/heatmap.cpp | 2 +- .../tool/ClangApplyReplacementsMain.cpp | 2 +- .../bugprone/ArgumentCommentCheck.cpp | 4 +-- .../bugprone/SignalHandlerCheck.cpp | 2 +- .../clang-tidy/concurrency/MtUnsafeCheck.cpp | 2 +- .../clang-tidy/modernize/AvoidBindCheck.cpp | 4 +-- .../clang-tidy/modernize/LoopConvertCheck.cpp | 4 +-- .../readability/IdentifierNamingCheck.cpp | 4 +-- .../clang-tidy/utils/IncludeSorter.cpp | 2 +- clang-tools-extra/clangd/ClangdLSPServer.cpp | 2 +- clang-tools-extra/clangd/CompileCommands.cpp | 4 +-- clang-tools-extra/clangd/FindSymbols.cpp | 2 +- clang-tools-extra/clangd/Preamble.cpp | 2 +- clang-tools-extra/clangd/Selection.cpp | 4 +-- clang-tools-extra/clangd/XRefs.cpp | 4 +-- .../clangd/refactor/tweaks/DefineOutline.cpp | 2 +- clang-tools-extra/clangd/tool/Check.cpp | 4 +-- .../clangd/unittests/CompileCommandsTests.cpp | 12 ++++----- .../include-cleaner/lib/HTMLReport.cpp | 2 +- .../pseudo/include/clang-pseudo/Forest.h | 3 +-- .../pseudo/include/clang-pseudo/GLR.h | 4 +-- .../include/clang-pseudo/grammar/LRTable.h | 8 +++--- clang-tools-extra/pseudo/lib/Forest.cpp | 2 +- clang-tools-extra/pseudo/lib/GLR.cpp | 2 +- .../pseudo/lib/grammar/Grammar.cpp | 4 +-- .../clang-tidy/ClangTidyOptionsTest.cpp | 2 +- flang/lib/Lower/ConvertVariable.cpp | 2 +- flang/tools/flang-driver/driver.cpp | 2 +- .../benchmarks/LibcDefaultImplementations.cpp | 12 ++++----- libc/benchmarks/LibcMemoryBenchmarkMain.cpp | 2 +- libc/benchmarks/automemcpy/lib/CodeGen.cpp | 8 +++--- .../automemcpy/unittests/CodeGenTest.cpp | 10 +++---- lld/COFF/Chunks.h | 2 +- lld/COFF/DebugTypes.cpp | 9 +++---- lld/COFF/DriverUtils.cpp | 2 +- lld/COFF/PDB.cpp | 8 +++--- lld/ELF/Arch/AMDGPU.cpp | 4 +-- lld/ELF/Arch/AVR.cpp | 2 +- lld/ELF/Arch/PPC64.cpp | 4 +-- lld/ELF/Arch/RISCV.cpp | 4 +-- lld/ELF/Config.h | 2 +- lld/ELF/Driver.cpp | 2 +- lld/ELF/InputFiles.h | 6 ++--- lld/ELF/InputSection.cpp | 14 +++++----- lld/ELF/InputSection.h | 2 +- lld/ELF/OutputSections.cpp | 4 +-- lld/ELF/SyntheticSections.cpp | 4 +-- lld/ELF/Writer.cpp | 6 ++--- lldb/include/lldb/Utility/AnsiTerminal.h | 2 +- lldb/include/lldb/Utility/Args.h | 2 +- lldb/source/API/SBDebugger.cpp | 2 +- lldb/source/Breakpoint/BreakpointID.cpp | 2 +- .../Commands/CommandObjectBreakpoint.cpp | 20 +++++++------- .../CommandObjectBreakpointCommand.cpp | 4 +-- .../source/Commands/CommandObjectCommands.cpp | 12 ++++----- .../Commands/CommandObjectDiagnostics.cpp | 2 +- .../Commands/CommandObjectDisassemble.cpp | 2 +- .../Commands/CommandObjectExpression.cpp | 2 +- lldb/source/Commands/CommandObjectFrame.cpp | 6 ++--- lldb/source/Commands/CommandObjectHelp.cpp | 2 +- lldb/source/Commands/CommandObjectLog.cpp | 4 +-- lldb/source/Commands/CommandObjectMemory.cpp | 8 +++--- .../Commands/CommandObjectMemoryTag.cpp | 2 +- .../source/Commands/CommandObjectPlatform.cpp | 12 ++++----- lldb/source/Commands/CommandObjectProcess.cpp | 16 +++++------ .../source/Commands/CommandObjectRegister.cpp | 2 +- lldb/source/Commands/CommandObjectScript.cpp | 2 +- lldb/source/Commands/CommandObjectSession.cpp | 2 +- .../source/Commands/CommandObjectSettings.cpp | 8 +++--- lldb/source/Commands/CommandObjectSource.cpp | 4 +-- lldb/source/Commands/CommandObjectStats.cpp | 2 +- lldb/source/Commands/CommandObjectTarget.cpp | 14 +++++----- lldb/source/Commands/CommandObjectThread.cpp | 20 +++++++------- lldb/source/Commands/CommandObjectTrace.cpp | 8 +++--- lldb/source/Commands/CommandObjectType.cpp | 22 +++++++-------- .../Commands/CommandObjectWatchpoint.cpp | 8 +++--- .../CommandObjectWatchpointCommand.cpp | 2 +- .../Commands/CommandOptionsProcessLaunch.cpp | 2 +- .../Host/common/NativeProcessProtocol.cpp | 26 +++++++++--------- .../Interpreter/OptionGroupArchitecture.cpp | 2 +- lldb/source/Interpreter/OptionGroupFormat.cpp | 2 +- .../Interpreter/OptionGroupMemoryTag.cpp | 2 +- .../Interpreter/OptionGroupOutputFile.cpp | 2 +- lldb/source/Interpreter/OptionGroupUUID.cpp | 2 +- .../OptionGroupValueObjectDisplay.cpp | 2 +- .../Interpreter/OptionGroupVariable.cpp | 2 +- .../Interpreter/OptionGroupWatchpoint.cpp | 2 +- .../source/Interpreter/OptionValueBoolean.cpp | 2 +- lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp | 2 +- .../AppleObjCRuntime/AppleObjCRuntimeV2.cpp | 2 +- .../RenderScriptRuntime.cpp | 8 +++--- .../Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 4 +-- .../ObjectFile/wasm/ObjectFileWasm.cpp | 2 +- .../Process/FreeBSD/NativeProcessFreeBSD.cpp | 4 +-- .../Process/Linux/NativeProcessLinux.cpp | 4 +-- .../Utility/RegisterInfoPOSIX_arm64.cpp | 6 ++--- .../Windows/Common/NativeProcessWindows.cpp | 4 +-- .../GDBRemoteCommunicationServerLLGS.cpp | 2 +- .../Process/minidump/MinidumpTypes.cpp | 2 +- .../Process/scripted/ScriptedProcess.cpp | 2 +- .../DarwinLog/StructuredDataDarwinLog.cpp | 2 +- .../SymbolFile/DWARF/DWARFDataExtractor.cpp | 6 ++--- .../NativePDB/DWARFLocationExpression.cpp | 2 +- .../SymbolFile/NativePDB/PdbAstBuilder.cpp | 2 +- .../CommandObjectTraceStartIntelPT.cpp | 4 +-- .../ctf/CommandObjectThreadTraceExportCTF.cpp | 2 +- lldb/source/Symbol/UnwindPlan.cpp | 5 ++-- lldb/source/Target/Platform.cpp | 6 ++--- lldb/source/Target/StackFrameRecognizer.cpp | 2 +- lldb/source/Utility/Args.cpp | 4 +-- lldb/source/Utility/StringList.cpp | 2 +- lldb/tools/driver/Driver.cpp | 2 +- lldb/tools/lldb-vscode/lldb-vscode.cpp | 2 +- .../Host/NativeProcessTestUtils.h | 2 +- mlir/examples/toy/Ch2/mlir/MLIRGen.cpp | 7 +++-- mlir/examples/toy/Ch3/mlir/MLIRGen.cpp | 7 +++-- mlir/examples/toy/Ch4/mlir/MLIRGen.cpp | 7 +++-- .../toy/Ch5/mlir/LowerToAffineLoops.cpp | 2 +- mlir/examples/toy/Ch5/mlir/MLIRGen.cpp | 7 +++-- .../toy/Ch6/mlir/LowerToAffineLoops.cpp | 2 +- mlir/examples/toy/Ch6/mlir/MLIRGen.cpp | 7 +++-- .../toy/Ch7/mlir/LowerToAffineLoops.cpp | 2 +- mlir/examples/toy/Ch7/mlir/MLIRGen.cpp | 9 +++---- .../include/mlir/Dialect/Shape/IR/ShapeOps.td | 8 +++--- .../mlir/Dialect/Tosa/Utils/ShapeUtils.h | 2 +- mlir/include/mlir/IR/AsmState.h | 3 +-- mlir/include/mlir/IR/AttrTypeBase.td | 2 +- mlir/include/mlir/IR/BuiltinAttributes.h | 6 ++--- mlir/include/mlir/IR/OpBase.td | 8 +++--- mlir/include/mlir/IR/OpDefinition.h | 3 +-- .../Analysis/Presburger/PresburgerSpace.cpp | 5 ++-- mlir/lib/AsmParser/AsmParserState.cpp | 4 +-- mlir/lib/AsmParser/AttributeParser.cpp | 4 +-- mlir/lib/Bindings/Python/IRCore.cpp | 2 +- mlir/lib/Bytecode/Reader/BytecodeReader.cpp | 4 +-- mlir/lib/CAPI/Dialect/Quant.cpp | 2 +- mlir/lib/CAPI/IR/AffineMap.cpp | 2 +- mlir/lib/CAPI/IR/BuiltinAttributes.cpp | 11 ++++---- mlir/lib/CAPI/IR/BuiltinTypes.cpp | 27 +++++++++---------- mlir/lib/CAPI/IR/IntegerSet.cpp | 2 +- .../AffineToStandard/AffineToStandard.cpp | 4 +-- .../Conversion/ArithToSPIRV/ArithToSPIRV.cpp | 10 +++---- .../ControlFlowToLLVM/ControlFlowToLLVM.cpp | 2 +- .../Conversion/LLVMCommon/MemRefBuilder.cpp | 2 +- .../Conversion/MemRefToLLVM/MemRefToLLVM.cpp | 2 +- .../VectorToSPIRV/VectorToSPIRV.cpp | 2 +- mlir/lib/Dialect/Affine/IR/AffineOps.cpp | 2 +- mlir/lib/Dialect/Affine/Utils/Utils.cpp | 6 ++--- mlir/lib/Dialect/Func/IR/FuncOps.cpp | 2 +- .../GPU/Transforms/AllReduceLowering.cpp | 2 +- .../GPU/Transforms/MemoryPromotion.cpp | 4 +-- mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp | 2 +- mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp | 4 +-- mlir/lib/Dialect/Linalg/Utils/Utils.cpp | 2 +- .../Transforms/PolynomialApproximation.cpp | 2 +- mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp | 2 +- mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp | 4 +-- .../SPIRV/Transforms/SPIRVConversion.cpp | 2 +- mlir/lib/Dialect/Shape/IR/Shape.cpp | 6 ++--- .../Transforms/SplitPaddingPatterns.cpp | 2 +- .../Transform/IR/TransformInterfaces.cpp | 2 +- mlir/lib/Dialect/Vector/IR/VectorOps.cpp | 12 ++++----- .../ExecutionEngine/RocmRuntimeWrappers.cpp | 2 +- mlir/lib/Interfaces/DataLayoutInterfaces.cpp | 2 +- mlir/lib/TableGen/Format.cpp | 2 +- .../SPIRV/Deserialization/Deserializer.cpp | 2 +- .../Target/SPIRV/TranslateRegistration.cpp | 4 +-- mlir/lib/Tools/PDLL/AST/NodePrinter.cpp | 2 +- mlir/lib/Tools/PDLL/AST/TypeDetail.h | 6 ++--- .../Transforms/Utils/DialectConversion.cpp | 6 ++--- mlir/test/lib/Dialect/Test/TestDialect.cpp | 4 +-- mlir/test/lib/Dialect/Test/TestPatterns.cpp | 4 +-- mlir/test/mlir-tblgen/op-attribute.td | 4 +-- .../tools/mlir-tblgen/AttrOrTypeFormatGen.cpp | 4 +-- mlir/tools/mlir-tblgen/FormatGen.h | 4 +-- mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp | 2 +- mlir/tools/mlir-tblgen/OpPythonBindingGen.cpp | 6 ++--- mlir/unittests/IR/AttributeTest.cpp | 16 +++++------ mlir/unittests/IR/SubElementInterfaceTest.cpp | 2 +- 181 files changed, 405 insertions(+), 423 deletions(-) diff --git a/bolt/tools/bat-dump/bat-dump.cpp b/bolt/tools/bat-dump/bat-dump.cpp index 87a396e38a24..fa53c5b122f8 100644 --- a/bolt/tools/bat-dump/bat-dump.cpp +++ b/bolt/tools/bat-dump/bat-dump.cpp @@ -151,7 +151,7 @@ void dumpBATFor(llvm::object::ELFObjectFileBase *InputFile) { } int main(int argc, char **argv) { - cl::HideUnrelatedOptions(makeArrayRef(opts::BatDumpCategories)); + cl::HideUnrelatedOptions(ArrayRef(opts::BatDumpCategories)); cl::ParseCommandLineOptions(argc, argv, ""); if (!sys::fs::exists(opts::InputFilename)) diff --git a/bolt/tools/driver/llvm-bolt.cpp b/bolt/tools/driver/llvm-bolt.cpp index 942a434d0971..e7517d1c395c 100644 --- a/bolt/tools/driver/llvm-bolt.cpp +++ b/bolt/tools/driver/llvm-bolt.cpp @@ -98,7 +98,7 @@ static void printBoltRevision(llvm::raw_ostream &OS) { } void perf2boltMode(int argc, char **argv) { - cl::HideUnrelatedOptions(makeArrayRef(opts::Perf2BoltCategories)); + cl::HideUnrelatedOptions(ArrayRef(opts::Perf2BoltCategories)); cl::AddExtraVersionPrinter(printBoltRevision); cl::ParseCommandLineOptions( argc, argv, @@ -127,7 +127,7 @@ void perf2boltMode(int argc, char **argv) { } void boltDiffMode(int argc, char **argv) { - cl::HideUnrelatedOptions(makeArrayRef(opts::BoltDiffCategories)); + cl::HideUnrelatedOptions(ArrayRef(opts::BoltDiffCategories)); cl::AddExtraVersionPrinter(printBoltRevision); cl::ParseCommandLineOptions( argc, argv, @@ -153,7 +153,7 @@ void boltDiffMode(int argc, char **argv) { } void boltMode(int argc, char **argv) { - cl::HideUnrelatedOptions(makeArrayRef(opts::BoltCategories)); + cl::HideUnrelatedOptions(ArrayRef(opts::BoltCategories)); // Register the target printer for --version. cl::AddExtraVersionPrinter(printBoltRevision); cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion); diff --git a/bolt/tools/heatmap/heatmap.cpp b/bolt/tools/heatmap/heatmap.cpp index fa28e858568e..b49245e853df 100644 --- a/bolt/tools/heatmap/heatmap.cpp +++ b/bolt/tools/heatmap/heatmap.cpp @@ -50,7 +50,7 @@ static std::string GetExecutablePath(const char *Argv0) { } int main(int argc, char **argv) { - cl::HideUnrelatedOptions(makeArrayRef(opts::HeatmapCategories)); + cl::HideUnrelatedOptions(ArrayRef(opts::HeatmapCategories)); cl::ParseCommandLineOptions(argc, argv, ""); if (opts::PerfData.empty()) { diff --git a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp index 68e7feaa3bae..415ae47ce6d7 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp +++ b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp @@ -91,7 +91,7 @@ static void printVersion(raw_ostream &OS) { } int main(int argc, char **argv) { - cl::HideUnrelatedOptions(makeArrayRef(VisibleCategories)); + cl::HideUnrelatedOptions(ArrayRef(VisibleCategories)); cl::SetVersionPrinter(printVersion); cl::ParseCommandLineOptions(argc, argv); diff --git a/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp index 396b36d6e9af..76b8cd68fde8 100644 --- a/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp @@ -353,7 +353,7 @@ void ArgumentCommentCheck::check(const MatchFinder::MatchResult &Result) { return; checkCallArgs(Result.Context, Callee, Call->getCallee()->getEndLoc(), - llvm::makeArrayRef(Call->getArgs(), Call->getNumArgs())); + llvm::ArrayRef(Call->getArgs(), Call->getNumArgs())); } else { const auto *Construct = cast(E); if (Construct->getNumArgs() > 0 && @@ -364,7 +364,7 @@ void ArgumentCommentCheck::check(const MatchFinder::MatchResult &Result) { checkCallArgs( Result.Context, Construct->getConstructor(), Construct->getParenOrBraceRange().getBegin(), - llvm::makeArrayRef(Construct->getArgs(), Construct->getNumArgs())); + llvm::ArrayRef(Construct->getArgs(), Construct->getNumArgs())); } } diff --git a/clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp index fc91d79f26a6..b1684d36d152 100644 --- a/clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp @@ -236,7 +236,7 @@ struct OptionEnumMapping< {bugprone::SignalHandlerCheck::AsyncSafeFunctionSetKind::POSIX, "POSIX"}, }; - return makeArrayRef(Mapping); + return ArrayRef(Mapping); } }; diff --git a/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp b/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp index 57c2c9c0a064..b087ad6972e4 100644 --- a/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp +++ b/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp @@ -270,7 +270,7 @@ template <> struct OptionEnumMapping { Mapping[] = {{concurrency::MtUnsafeCheck::FunctionSet::Posix, "posix"}, {concurrency::MtUnsafeCheck::FunctionSet::Glibc, "glibc"}, {concurrency::MtUnsafeCheck::FunctionSet::Any, "any"}}; - return makeArrayRef(Mapping); + return ArrayRef(Mapping); } }; diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp index 1a82c5fc290a..8783a547ad2b 100644 --- a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp @@ -627,7 +627,7 @@ static void emitCaptureList(const LambdaProperties &LP, static ArrayRef getForwardedArgumentList(const LambdaProperties &P) { - ArrayRef Args = makeArrayRef(P.BindArguments); + ArrayRef Args = ArrayRef(P.BindArguments); if (P.Callable.Type != CT_MemberFunction) return Args; @@ -672,7 +672,7 @@ void AvoidBindCheck::check(const MatchFinder::MatchResult &Result) { emitCaptureList(LP, Result, Stream); Stream << "]"; - ArrayRef FunctionCallArgs = makeArrayRef(LP.BindArguments); + ArrayRef FunctionCallArgs = ArrayRef(LP.BindArguments); addPlaceholderArgs(LP, Stream, PermissiveParameterList); diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp index 51de77ba4dd5..84df6445ef77 100644 --- a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp @@ -37,7 +37,7 @@ template <> struct OptionEnumMapping { Mapping[] = {{modernize::Confidence::CL_Reasonable, "reasonable"}, {modernize::Confidence::CL_Safe, "safe"}, {modernize::Confidence::CL_Risky, "risky"}}; - return makeArrayRef(Mapping); + return ArrayRef(Mapping); } }; @@ -50,7 +50,7 @@ template <> struct OptionEnumMapping { {modernize::VariableNamer::NS_CamelBack, "camelBack"}, {modernize::VariableNamer::NS_LowerCase, "lower_case"}, {modernize::VariableNamer::NS_UpperCase, "UPPER_CASE"}}; - return makeArrayRef(Mapping); + return ArrayRef(Mapping); } }; diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp index 7f9004ae26d4..47a55d3439a4 100644 --- a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp @@ -47,7 +47,7 @@ OptionEnumMapping< "Camel_Snake_Case"}, {readability::IdentifierNamingCheck::CT_CamelSnakeBack, "camel_Snake_Back"}}; - return llvm::makeArrayRef(Mapping); + return llvm::ArrayRef(Mapping); } template <> @@ -62,7 +62,7 @@ struct OptionEnumMapping< {HungarianPrefixType::HPT_On, "On"}, {HungarianPrefixType::HPT_LowerCase, "LowerCase"}, {HungarianPrefixType::HPT_CamelCase, "CamelCase"}}; - return llvm::makeArrayRef(Mapping); + return llvm::ArrayRef(Mapping); } }; diff --git a/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp b/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp index dbb3b38b5aa4..1ce110e797f9 100644 --- a/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp +++ b/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp @@ -231,7 +231,7 @@ OptionEnumMapping::getEnumMapping() { Mapping[] = {{utils::IncludeSorter::IS_LLVM, "llvm"}, {utils::IncludeSorter::IS_Google, "google"}, {utils::IncludeSorter::IS_Google_ObjC, "google-objc"}}; - return makeArrayRef(Mapping); + return ArrayRef(Mapping); } } // namespace tidy } // namespace clang diff --git a/clang-tools-extra/clangd/ClangdLSPServer.cpp b/clang-tools-extra/clangd/ClangdLSPServer.cpp index 24eaadb9de4c..860519d21b0e 100644 --- a/clang-tools-extra/clangd/ClangdLSPServer.cpp +++ b/clang-tools-extra/clangd/ClangdLSPServer.cpp @@ -505,7 +505,7 @@ void ClangdLSPServer::onInitialize(const InitializeParams &Params, } auto Mangler = CommandMangler::detect(); Mangler.SystemIncludeExtractor = - getSystemIncludeExtractor(llvm::makeArrayRef(Opts.QueryDriverGlobs)); + getSystemIncludeExtractor(llvm::ArrayRef(Opts.QueryDriverGlobs)); if (Opts.ResourceDir) Mangler.ResourceDir = *Opts.ResourceDir; CDB.emplace(BaseCDB.get(), Params.initializationOptions.fallbackFlags, diff --git a/clang-tools-extra/clangd/CompileCommands.cpp b/clang-tools-extra/clangd/CompileCommands.cpp index 3b7e25789cea..bcd39b2d38ba 100644 --- a/clang-tools-extra/clangd/CompileCommands.cpp +++ b/clang-tools-extra/clangd/CompileCommands.cpp @@ -211,7 +211,7 @@ void CommandMangler::operator()(tooling::CompileCommand &Command, for (const auto &S : Cmd) OriginalArgs.push_back(S.c_str()); bool IsCLMode = driver::IsClangCL(driver::getDriverMode( - OriginalArgs[0], llvm::makeArrayRef(OriginalArgs).slice(1))); + OriginalArgs[0], llvm::ArrayRef(OriginalArgs).slice(1))); // ParseArgs propagates missig arg/opt counts on error, but preserves // everything it could parse in ArgList. So we just ignore those counts. unsigned IgnoredCount; @@ -219,7 +219,7 @@ void CommandMangler::operator()(tooling::CompileCommand &Command, // indices are actually of by one between ArgList and OriginalArgs. llvm::opt::InputArgList ArgList; ArgList = OptTable.ParseArgs( - llvm::makeArrayRef(OriginalArgs).drop_front(), IgnoredCount, IgnoredCount, + llvm::ArrayRef(OriginalArgs).drop_front(), IgnoredCount, IgnoredCount, /*FlagsToInclude=*/ IsCLMode ? (driver::options::CLOption | driver::options::CoreOption | driver::options::CLDXCOption) diff --git a/clang-tools-extra/clangd/FindSymbols.cpp b/clang-tools-extra/clangd/FindSymbols.cpp index 6e6dbb208fba..2eab7ca27033 100644 --- a/clang-tools-extra/clangd/FindSymbols.cpp +++ b/clang-tools-extra/clangd/FindSymbols.cpp @@ -644,7 +644,7 @@ std::vector collectDocSymbols(ParsedAST &AST) { DocumentSymbol Root; Root.children = std::move(Syms); Root.range = EntireFile; - mergePragmas(Root, llvm::makeArrayRef(Pragmas)); + mergePragmas(Root, llvm::ArrayRef(Pragmas)); return Root.children; } diff --git a/clang-tools-extra/clangd/Preamble.cpp b/clang-tools-extra/clangd/Preamble.cpp index 0b8d78bdcba9..44a532511c16 100644 --- a/clang-tools-extra/clangd/Preamble.cpp +++ b/clang-tools-extra/clangd/Preamble.cpp @@ -58,7 +58,7 @@ bool compileCommandsAreEqual(const tooling::CompileCommand &LHS, const tooling::CompileCommand &RHS) { // We don't check for Output, it should not matter to clangd. return LHS.Directory == RHS.Directory && LHS.Filename == RHS.Filename && - llvm::makeArrayRef(LHS.CommandLine).equals(RHS.CommandLine); + llvm::ArrayRef(LHS.CommandLine).equals(RHS.CommandLine); } class CppFilePreambleCallbacks : public PreambleCallbacks { diff --git a/clang-tools-extra/clangd/Selection.cpp b/clang-tools-extra/clangd/Selection.cpp index f46da8e41f58..233a3c7cd313 100644 --- a/clang-tools-extra/clangd/Selection.cpp +++ b/clang-tools-extra/clangd/Selection.cpp @@ -262,7 +262,7 @@ public: SelFirst, AllSpelledTokens.end(), [&](const syntax::Token &Tok) { return SM.getFileOffset(Tok.location()) < SelEnd; }); - auto Sel = llvm::makeArrayRef(SelFirst, SelLimit); + auto Sel = llvm::ArrayRef(SelFirst, SelLimit); // Find which of these are preprocessed to nothing and should be ignored. llvm::BitVector PPIgnored(Sel.size(), false); for (const syntax::TokenBuffer::Expansion &X : @@ -419,7 +419,7 @@ private: if (EndInvalid) End = Toks.expandedTokens().end(); - return llvm::makeArrayRef(Start, End); + return llvm::ArrayRef(Start, End); } // Hit-test a consecutive range of tokens from a single file ID. diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp index 60ea117ab9c6..1b1220c8aa7a 100644 --- a/clang-tools-extra/clangd/XRefs.cpp +++ b/clang-tools-extra/clangd/XRefs.cpp @@ -726,12 +726,12 @@ const syntax::Token *findNearbyIdentifier(const SpelledWord &Word, return T.location() < Word.Location; // Comparison OK: same file. }); // Search for matches after the cursor. - for (const syntax::Token &Tok : llvm::makeArrayRef(I, SpelledTokens.end())) + for (const syntax::Token &Tok : llvm::ArrayRef(I, SpelledTokens.end())) if (Consider(Tok)) break; // costs of later tokens are greater... // Search for matches before the cursor. for (const syntax::Token &Tok : - llvm::reverse(llvm::makeArrayRef(SpelledTokens.begin(), I))) + llvm::reverse(llvm::ArrayRef(SpelledTokens.begin(), I))) if (Consider(Tok)) break; diff --git a/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp b/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp index 69999d4e225a..a4d60c6c11bb 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp @@ -242,7 +242,7 @@ getFunctionSourceCode(const FunctionDecl *FD, llvm::StringRef TargetNamespace, if (Tok.kind() != Kind) continue; FoundAny = true; - auto Spelling = TokBuf.spelledForExpanded(llvm::makeArrayRef(Tok)); + auto Spelling = TokBuf.spelledForExpanded(llvm::ArrayRef(Tok)); if (!Spelling) { Errors = llvm::joinErrors( std::move(Errors), diff --git a/clang-tools-extra/clangd/tool/Check.cpp b/clang-tools-extra/clangd/tool/Check.cpp index 3959a9051b09..33ae3b1612b9 100644 --- a/clang-tools-extra/clangd/tool/Check.cpp +++ b/clang-tools-extra/clangd/tool/Check.cpp @@ -145,7 +145,7 @@ public: std::make_unique(CDBOpts); auto Mangler = CommandMangler::detect(); Mangler.SystemIncludeExtractor = - getSystemIncludeExtractor(llvm::makeArrayRef(Opts.QueryDriverGlobs)); + getSystemIncludeExtractor(llvm::ArrayRef(Opts.QueryDriverGlobs)); if (Opts.ResourceDir) Mangler.ResourceDir = *Opts.ResourceDir; auto CDB = std::make_unique( @@ -228,7 +228,7 @@ public: elog("Failed to build AST"); return false; } - ErrCount += showErrors(llvm::makeArrayRef(*AST->getDiagnostics()) + ErrCount += showErrors(llvm::ArrayRef(*AST->getDiagnostics()) .drop_front(Preamble->Diags.size())); if (Opts.BuildDynamicSymbolIndex) { diff --git a/clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp b/clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp index 504487d4e73d..be44ce59f665 100644 --- a/clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp +++ b/clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp @@ -375,9 +375,9 @@ TEST(CommandMangler, InputsAfterDashDash) { tooling::CompileCommand Cmd; Cmd.CommandLine = {"clang", "/Users/foo.cc"}; Mangler(Cmd, "/Users/foo.cc"); - EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2), + EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).take_back(2), ElementsAre("--", "/Users/foo.cc")); - EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).drop_back(2), + EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).drop_back(2), Not(Contains("/Users/foo.cc"))); } // In CL mode /U triggers an undef operation, hence `/Users/foo.cc` shouldn't @@ -386,9 +386,9 @@ TEST(CommandMangler, InputsAfterDashDash) { tooling::CompileCommand Cmd; Cmd.CommandLine = {"clang", "--driver-mode=cl", "bar.cc", "/Users/foo.cc"}; Mangler(Cmd, "bar.cc"); - EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2), + EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).take_back(2), ElementsAre("--", "bar.cc")); - EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).drop_back(2), + EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).drop_back(2), Not(Contains("bar.cc"))); } // All inputs but the main file is dropped. @@ -396,10 +396,10 @@ TEST(CommandMangler, InputsAfterDashDash) { tooling::CompileCommand Cmd; Cmd.CommandLine = {"clang", "foo.cc", "bar.cc"}; Mangler(Cmd, "baz.cc"); - EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2), + EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).take_back(2), ElementsAre("--", "baz.cc")); EXPECT_THAT( - llvm::makeArrayRef(Cmd.CommandLine).drop_back(2), + llvm::ArrayRef(Cmd.CommandLine).drop_back(2), testing::AllOf(Not(Contains("foo.cc")), Not(Contains("bar.cc")))); } } diff --git a/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp b/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp index 22debdc5e83d..be78d0b4aa77 100644 --- a/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp +++ b/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp @@ -460,7 +460,7 @@ private: return std::make_pair(Refs[A].Offset, Refs[A].Type != RefType::Implicit) < std::make_pair(Refs[B].Offset, Refs[B].Type != RefType::Implicit); }); - auto Rest = llvm::makeArrayRef(RefOrder); + auto Rest = llvm::ArrayRef(RefOrder); unsigned End = 0; StartLine(); for (unsigned I = 0; I < Code.size(); ++I) { diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h b/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h index 769bd2350829..691acacdbb52 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h @@ -139,8 +139,7 @@ private: // Retrieves the trailing array. llvm::ArrayRef children(uint16_t Num) const { - return llvm::makeArrayRef(reinterpret_cast(this + 1), - Num); + return llvm::ArrayRef(reinterpret_cast(this + 1), Num); } llvm::MutableArrayRef children(uint16_t Num) { return llvm::makeMutableArrayRef(reinterpret_cast(this + 1), diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h b/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h index 1e867891b972..0100f818d4ed 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h @@ -83,8 +83,8 @@ struct GSS { const ForestNode *Payload = nullptr; llvm::ArrayRef parents() const { - return llvm::makeArrayRef(reinterpret_cast(this + 1), - ParentCount); + return llvm::ArrayRef(reinterpret_cast(this + 1), + ParentCount); }; // Parents are stored as a trailing array of Node*. }; diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h index 65d5fbfc5cbf..9fc4689da22b 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h @@ -98,8 +98,8 @@ public: // } llvm::ArrayRef getReduceRules(StateID State) const { assert(State + 1u < ReduceOffset.size()); - return llvm::makeArrayRef(Reduces.data() + ReduceOffset[State], - Reduces.data() + ReduceOffset[State+1]); + return llvm::ArrayRef(Reduces.data() + ReduceOffset[State], + Reduces.data() + ReduceOffset[State + 1]); } // Returns whether Terminal can follow Nonterminal in a valid source file. bool canFollow(SymbolID Nonterminal, SymbolID Terminal) const { @@ -113,8 +113,8 @@ public: // Looks up available recovery actions if we stopped parsing in this state. llvm::ArrayRef getRecovery(StateID State) const { - return llvm::makeArrayRef(Recoveries.data() + RecoveryOffset[State], - Recoveries.data() + RecoveryOffset[State + 1]); + return llvm::ArrayRef(Recoveries.data() + RecoveryOffset[State], + Recoveries.data() + RecoveryOffset[State + 1]); } // Returns the state from which the LR parser should start to parse the input diff --git a/clang-tools-extra/pseudo/lib/Forest.cpp b/clang-tools-extra/pseudo/lib/Forest.cpp index 6162e02dab49..e8e60e5ec475 100644 --- a/clang-tools-extra/pseudo/lib/Forest.cpp +++ b/clang-tools-extra/pseudo/lib/Forest.cpp @@ -192,7 +192,7 @@ ForestArena::createTerminals(const TokenStream &Code) { /*Start=*/Index, /*TerminalData*/ 0); ++Index; NodeCount = Index; - return llvm::makeArrayRef(Terminals, Index); + return llvm::ArrayRef(Terminals, Index); } } // namespace pseudo diff --git a/clang-tools-extra/pseudo/lib/GLR.cpp b/clang-tools-extra/pseudo/lib/GLR.cpp index 35a81810de63..ac43c02db521 100644 --- a/clang-tools-extra/pseudo/lib/GLR.cpp +++ b/clang-tools-extra/pseudo/lib/GLR.cpp @@ -237,7 +237,7 @@ void glrShift(llvm::ArrayRef OldHeads, Shifts.push_back({*S, H}); llvm::stable_sort(Shifts, llvm::less_first{}); - auto Rest = llvm::makeArrayRef(Shifts); + auto Rest = llvm::ArrayRef(Shifts); llvm::SmallVector Parents; while (!Rest.empty()) { // Collect the batch of PendingShift that have compatible shift states. diff --git a/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp b/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp index 6df5565081fa..3e9c5c3c7a6c 100644 --- a/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp +++ b/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp @@ -32,7 +32,7 @@ llvm::ArrayRef Grammar::rulesFor(SymbolID SID) const { assert(isNonterminal(SID)); const auto &R = T->Nonterminals[SID].RuleRange; assert(R.End <= T->Rules.size()); - return llvm::makeArrayRef(&T->Rules[R.Start], R.End - R.Start); + return llvm::ArrayRef(&T->Rules[R.Start], R.End - R.Start); } const Rule &Grammar::lookupRule(RuleID RID) const { @@ -180,7 +180,7 @@ static llvm::ArrayRef getTerminalNames() { TerminalNames[tok::kw_##Keyword] = llvm::StringRef(#Keyword).upper(); #define TOK(Tok) TerminalNames[tok::Tok] = llvm::StringRef(#Tok).upper(); #include "clang/Basic/TokenKinds.def" - return llvm::makeArrayRef(TerminalNames, NumTerminals); + return llvm::ArrayRef(TerminalNames, NumTerminals); }(); return TerminalNames; } diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp b/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp index 36b7d1b8065c..04835d2a9147 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp @@ -20,7 +20,7 @@ template <> struct OptionEnumMapping { {Colours::Yellow, "Yellow"}, {Colours::Green, "Green"}, {Colours::Blue, "Blue"}, {Colours::Indigo, "Indigo"}, {Colours::Violet, "Violet"}}; - return makeArrayRef(Mapping); + return ArrayRef(Mapping); } }; diff --git a/flang/lib/Lower/ConvertVariable.cpp b/flang/lib/Lower/ConvertVariable.cpp index 8cb6dea1363a..374380c21285 100644 --- a/flang/lib/Lower/ConvertVariable.cpp +++ b/flang/lib/Lower/ConvertVariable.cpp @@ -1014,7 +1014,7 @@ declareCommonBlock(Fortran::lower::AbstractConverter &converter, auto commonTy = fir::SequenceType::get(shape, i8Ty); auto vecTy = mlir::VectorType::get(sz, i8Ty); mlir::Attribute zero = builder.getIntegerAttr(i8Ty, 0); - auto init = mlir::DenseElementsAttr::get(vecTy, llvm::makeArrayRef(zero)); + auto init = mlir::DenseElementsAttr::get(vecTy, llvm::ArrayRef(zero)); builder.createGlobal(loc, commonTy, commonName, linkage, init); // No need to add any initial value later. return std::nullopt; diff --git a/flang/tools/flang-driver/driver.cpp b/flang/tools/flang-driver/driver.cpp index e4880b62ee85..5c0342e45ec3 100644 --- a/flang/tools/flang-driver/driver.cpp +++ b/flang/tools/flang-driver/driver.cpp @@ -63,7 +63,7 @@ createAndPopulateDiagOpts(llvm::ArrayRef argv) { static int executeFC1Tool(llvm::SmallVectorImpl &argV) { llvm::StringRef tool = argV[1]; if (tool == "-fc1") - return fc1_main(makeArrayRef(argV).slice(2), argV[0]); + return fc1_main(llvm::ArrayRef(argV).slice(2), argV[0]); // Reject unknown tools. // ATM it only supports fc1. Any fc1[*] is rejected. diff --git a/libc/benchmarks/LibcDefaultImplementations.cpp b/libc/benchmarks/LibcDefaultImplementations.cpp index 2448a6b404f9..95077cd65915 100644 --- a/libc/benchmarks/LibcDefaultImplementations.cpp +++ b/libc/benchmarks/LibcDefaultImplementations.cpp @@ -24,30 +24,30 @@ using llvm::libc_benchmarks::MemsetConfiguration; llvm::ArrayRef getMemcpyConfigurations() { static constexpr MemcpyConfiguration kMemcpyConfigurations[] = { {__llvm_libc::memcpy, "__llvm_libc::memcpy"}}; - return llvm::makeArrayRef(kMemcpyConfigurations); + return llvm::ArrayRef(kMemcpyConfigurations); } llvm::ArrayRef getMemmoveConfigurations() { static constexpr MemmoveConfiguration kMemmoveConfigurations[] = { {__llvm_libc::memmove, "__llvm_libc::memmove"}}; - return llvm::makeArrayRef(kMemmoveConfigurations); + return llvm::ArrayRef(kMemmoveConfigurations); } llvm::ArrayRef getMemcmpConfigurations() { static constexpr MemcmpOrBcmpConfiguration kMemcmpConfiguration[] = { {__llvm_libc::memcmp, "__llvm_libc::memcmp"}}; - return llvm::makeArrayRef(kMemcmpConfiguration); + return llvm::ArrayRef(kMemcmpConfiguration); } llvm::ArrayRef getBcmpConfigurations() { static constexpr MemcmpOrBcmpConfiguration kBcmpConfigurations[] = { {__llvm_libc::bcmp, "__llvm_libc::bcmp"}}; - return llvm::makeArrayRef(kBcmpConfigurations); + return llvm::ArrayRef(kBcmpConfigurations); } llvm::ArrayRef getMemsetConfigurations() { static constexpr MemsetConfiguration kMemsetConfigurations[] = { {__llvm_libc::memset, "__llvm_libc::memset"}}; - return llvm::makeArrayRef(kMemsetConfigurations); + return llvm::ArrayRef(kMemsetConfigurations); } llvm::ArrayRef getBzeroConfigurations() { static constexpr BzeroConfiguration kBzeroConfigurations[] = { {__llvm_libc::bzero, "__llvm_libc::bzero"}}; - return llvm::makeArrayRef(kBzeroConfigurations); + return llvm::ArrayRef(kBzeroConfigurations); } diff --git a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp index f5752573e0f0..4fc6777cec45 100644 --- a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp +++ b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp @@ -97,7 +97,7 @@ struct MemfunctionBenchmarkBase : public BenchmarkSetup { CircularArrayRef generateBatch(size_t Iterations) { randomize(); - return cycle(makeArrayRef(Parameters), Iterations); + return cycle(ArrayRef(Parameters), Iterations); } protected: diff --git a/libc/benchmarks/automemcpy/lib/CodeGen.cpp b/libc/benchmarks/automemcpy/lib/CodeGen.cpp index 7f7d2b564b38..b11317934858 100644 --- a/libc/benchmarks/automemcpy/lib/CodeGen.cpp +++ b/libc/benchmarks/automemcpy/lib/CodeGen.cpp @@ -314,7 +314,7 @@ namespace descriptors { // {"memcpy_0x8661D80472487AB5",{FunctionType::MEMCPY,Contiguous{{0,1}},std::nullopt,std::nullopt,std::nullopt,Accelerator{{1,kMaxSize}},ElementTypeClass::NATIVE}}, // ... // }; -// return makeArrayRef(kDescriptors); +// return ArrayRef(kDescriptors); // } static raw_ostream &operator<<(raw_ostream &Stream, const SizeSpan &SS) { @@ -415,7 +415,7 @@ static void Serialize(raw_ostream &Stream, Stream << kIndent << kIndent << Descriptors[I] << ",\n"; } Stream << R"( }; - return makeArrayRef(kDescriptors); + return ArrayRef(kDescriptors); } )"; } @@ -434,7 +434,7 @@ namespace configurations { // {Wrap, "memcpy_0x8661D80472487AB5"}, // ... // }; -// return llvm::makeArrayRef(kConfigurations); +// return llvm::ArrayRef(kConfigurations); // } // The `Wrap` template function is provided in the `Main` function below. @@ -509,7 +509,7 @@ static raw_ostream &operator<<(raw_ostream &Stream, const Configuration &C) { << " kConfigurations[] = {\n"; Stream << C.Descriptors; Stream << kIndent << "};\n"; - Stream << kIndent << "return llvm::makeArrayRef(kConfigurations);\n"; + Stream << kIndent << "return llvm::ArrayRef(kConfigurations);\n"; } Stream << "}\n"; return Stream; diff --git a/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp b/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp index 1d8df111f600..b0c5f3a05734 100644 --- a/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp +++ b/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp @@ -148,7 +148,7 @@ ArrayRef getFunctionDescriptors() { {"memset_0x3DF0F44E2ED6A50F",{FunctionType::MEMSET,Contiguous{{0,2}},Overlap{{2,256}},std::nullopt,AlignedLoop{Loop{{256,kMaxSize},32},32,AlignArg::_1},std::nullopt,ElementTypeClass::NATIVE}}, {"bzero_0x475977492C218AD4",{FunctionType::BZERO,Contiguous{{0,4}},Overlap{{4,128}},std::nullopt,AlignedLoop{Loop{{128,kMaxSize},32},32,AlignArg::_1},std::nullopt,ElementTypeClass::NATIVE}}, }; - return makeArrayRef(kDescriptors); + return ArrayRef(kDescriptors); } } // namespace automemcpy @@ -168,7 +168,7 @@ llvm::ArrayRef getMemcpyConfigurations() { {Wrap, "memcpy_0xE00E29EE73994E2B"}, {Wrap, "memcpy_0x7381B60C7BE75EF9"}, }; - return llvm::makeArrayRef(kConfigurations); + return llvm::ArrayRef(kConfigurations); } using MemcmpStub = int (*)(const char *, const char *, size_t); @@ -182,7 +182,7 @@ llvm::ArrayRef getMemcmpConfigurations() { static constexpr MemcmpOrBcmpConfiguration kConfigurations[] = { {Wrap, "memcmp_0x348D7BA6DB0EE033"}, }; - return llvm::makeArrayRef(kConfigurations); + return llvm::ArrayRef(kConfigurations); } llvm::ArrayRef getBcmpConfigurations() { return {}; @@ -199,7 +199,7 @@ llvm::ArrayRef getMemsetConfigurations() { {Wrap, "memset_0x71E761699B999863"}, {Wrap, "memset_0x3DF0F44E2ED6A50F"}, }; - return llvm::makeArrayRef(kConfigurations); + return llvm::ArrayRef(kConfigurations); } using BzeroStub = void (*)(char *, size_t); @@ -211,7 +211,7 @@ llvm::ArrayRef getBzeroConfigurations() { static constexpr BzeroConfiguration kConfigurations[] = { {Wrap, "bzero_0x475977492C218AD4"}, }; - return llvm::makeArrayRef(kConfigurations); + return llvm::ArrayRef(kConfigurations); } llvm::ArrayRef getMemmoveConfigurations() { diff --git a/lld/COFF/Chunks.h b/lld/COFF/Chunks.h index 40a2790c8f31..f5335fd3d7b6 100644 --- a/lld/COFF/Chunks.h +++ b/lld/COFF/Chunks.h @@ -276,7 +276,7 @@ public: } ArrayRef getRelocs() const { - return llvm::makeArrayRef(relocsData, relocsSize); + return llvm::ArrayRef(relocsData, relocsSize); } // Reloc setter used by ARM range extension thunk insertion. diff --git a/lld/COFF/DebugTypes.cpp b/lld/COFF/DebugTypes.cpp index 811889c6d246..274284f34905 100644 --- a/lld/COFF/DebugTypes.cpp +++ b/lld/COFF/DebugTypes.cpp @@ -603,7 +603,7 @@ void TpiSource::assignGHashesFromVector( return; GloballyHashedType *hashes = new GloballyHashedType[hashVec.size()]; memcpy(hashes, hashVec.data(), hashVec.size() * sizeof(GloballyHashedType)); - ghashes = makeArrayRef(hashes, hashVec.size()); + ghashes = ArrayRef(hashes, hashVec.size()); ownedGHashes = true; } @@ -1127,8 +1127,7 @@ void TypeMerger::mergeTypesWithGHash() { // - source 0, type 1... // - source 1, type 0... std::vector entries; - for (const GHashCell &cell : - makeArrayRef(ghashState.table.table, tableSize)) { + for (const GHashCell &cell : ArrayRef(ghashState.table.table, tableSize)) { if (!cell.isEmpty()) entries.push_back(cell); } @@ -1195,8 +1194,8 @@ void TypeMerger::sortDependencies() { ctx.tpiSourceList.insert(ctx.tpiSourceList.end(), objs.begin(), objs.end()); for (uint32_t i = 0, e = ctx.tpiSourceList.size(); i < e; ++i) ctx.tpiSourceList[i]->tpiSrcIdx = i; - dependencySources = makeArrayRef(ctx.tpiSourceList.data(), numDeps); - objectSources = makeArrayRef(ctx.tpiSourceList.data() + numDeps, numObjs); + dependencySources = ArrayRef(ctx.tpiSourceList.data(), numDeps); + objectSources = ArrayRef(ctx.tpiSourceList.data() + numDeps, numObjs); } /// Given the index into the ghash table for a particular type, return the type diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp index 782fdcdd4338..10b02b1f7113 100644 --- a/lld/COFF/DriverUtils.cpp +++ b/lld/COFF/DriverUtils.cpp @@ -853,7 +853,7 @@ opt::InputArgList ArgParser::parse(ArrayRef argv) { if (!args.hasArg(OPT_lldignoreenv)) addLINK(expandedArgv); cl::ExpandResponseFiles(saver(), getQuotingStyle(args), expandedArgv); - args = ctx.optTable.ParseArgs(makeArrayRef(expandedArgv).drop_front(), + args = ctx.optTable.ParseArgs(ArrayRef(expandedArgv).drop_front(), missingIndex, missingCount); // Print the real command line if response files are expanded. diff --git a/lld/COFF/PDB.cpp b/lld/COFF/PDB.cpp index da91455398e0..745afab12e82 100644 --- a/lld/COFF/PDB.cpp +++ b/lld/COFF/PDB.cpp @@ -494,7 +494,7 @@ static bool symbolGoesInGlobalsStream(const CVSymbol &sym, static void addGlobalSymbol(pdb::GSIStreamBuilder &builder, uint16_t modIndex, unsigned symOffset, std::vector &symStorage) { - CVSymbol sym(makeArrayRef(symStorage)); + CVSymbol sym{ArrayRef(symStorage)}; switch (sym.kind()) { case SymbolKind::S_CONSTANT: case SymbolKind::S_UDT: @@ -508,7 +508,7 @@ static void addGlobalSymbol(pdb::GSIStreamBuilder &builder, uint16_t modIndex, // to stabilize it. uint8_t *mem = bAlloc().Allocate(sym.length()); memcpy(mem, sym.data().data(), sym.length()); - builder.addGlobalSymbol(CVSymbol(makeArrayRef(mem, sym.length()))); + builder.addGlobalSymbol(CVSymbol(ArrayRef(mem, sym.length()))); break; } case SymbolKind::S_GPROC32: @@ -1021,7 +1021,7 @@ static ArrayRef relocateDebugChunk(SectionChunk &debugChunk) { assert(debugChunk.getOutputSectionIdx() == 0 && "debug sections should not be in output sections"); debugChunk.writeTo(buffer); - return makeArrayRef(buffer, debugChunk.getSize()); + return ArrayRef(buffer, debugChunk.getSize()); } void PDBLinker::addDebugSymbols(TpiSource *source) { @@ -1422,7 +1422,7 @@ void PDBLinker::addCommonLinkerModuleSymbols( ons.Name = "* Linker *"; ons.Signature = 0; - ArrayRef args = makeArrayRef(ctx.config.argv).drop_front(); + ArrayRef args = ArrayRef(ctx.config.argv).drop_front(); std::string argStr = quote(args); ebs.Fields.push_back("cwd"); SmallString<64> cwd; diff --git a/lld/ELF/Arch/AMDGPU.cpp b/lld/ELF/Arch/AMDGPU.cpp index 461f32017362..e5605497e272 100644 --- a/lld/ELF/Arch/AMDGPU.cpp +++ b/lld/ELF/Arch/AMDGPU.cpp @@ -51,7 +51,7 @@ uint32_t AMDGPU::calcEFlagsV3() const { uint32_t ret = getEFlags(ctx.objectFiles[0]); // Verify that all input files have the same e_flags. - for (InputFile *f : makeArrayRef(ctx.objectFiles).slice(1)) { + for (InputFile *f : ArrayRef(ctx.objectFiles).slice(1)) { if (ret == getEFlags(f)) continue; error("incompatible e_flags: " + toString(f)); @@ -69,7 +69,7 @@ uint32_t AMDGPU::calcEFlagsV4() const { // Verify that all input files have compatible e_flags (same mach, all // features in the same category are either ANY, ANY and ON, or ANY and OFF). - for (InputFile *f : makeArrayRef(ctx.objectFiles).slice(1)) { + for (InputFile *f : ArrayRef(ctx.objectFiles).slice(1)) { if (retMach != (getEFlags(f) & EF_AMDGPU_MACH)) { error("incompatible mach: " + toString(f)); return 0; diff --git a/lld/ELF/Arch/AVR.cpp b/lld/ELF/Arch/AVR.cpp index 976128cda103..f0bb8efc4c51 100644 --- a/lld/ELF/Arch/AVR.cpp +++ b/lld/ELF/Arch/AVR.cpp @@ -240,7 +240,7 @@ uint32_t AVR::calcEFlags() const { uint32_t flags = getEFlags(ctx.objectFiles[0]); bool hasLinkRelaxFlag = flags & EF_AVR_LINKRELAX_PREPARED; - for (InputFile *f : makeArrayRef(ctx.objectFiles).slice(1)) { + for (InputFile *f : ArrayRef(ctx.objectFiles).slice(1)) { uint32_t objFlags = getEFlags(f); if ((objFlags & EF_AVR_ARCH_MASK) != (flags & EF_AVR_ARCH_MASK)) error(toString(f) + diff --git a/lld/ELF/Arch/PPC64.cpp b/lld/ELF/Arch/PPC64.cpp index d9a6d335dfa8..36b1d0e3c9be 100644 --- a/lld/ELF/Arch/PPC64.cpp +++ b/lld/ELF/Arch/PPC64.cpp @@ -271,8 +271,8 @@ static void writeSequence(MutableArrayRef buf, const char *prefix, // instructions and write [first,end). auto *sec = make( nullptr, SHF_ALLOC, SHT_PROGBITS, 4, - makeArrayRef(reinterpret_cast(buf.data() + first), - 4 * (buf.size() - first)), + ArrayRef(reinterpret_cast(buf.data() + first), + 4 * (buf.size() - first)), ".text"); ctx.inputSections.push_back(sec); for (Defined *sym : defined) { diff --git a/lld/ELF/Arch/RISCV.cpp b/lld/ELF/Arch/RISCV.cpp index a2f56472467a..6c478ad4109b 100644 --- a/lld/ELF/Arch/RISCV.cpp +++ b/lld/ELF/Arch/RISCV.cpp @@ -620,7 +620,7 @@ static bool relax(InputSection &sec) { // Get st_value delta for symbols relative to this section from the previous // iteration. DenseMap valueDelta; - ArrayRef sa = makeArrayRef(aux.anchors); + ArrayRef sa = ArrayRef(aux.anchors); uint32_t delta = 0; for (auto [i, r] : llvm::enumerate(sec.relocs())) { for (; sa.size() && sa[0].offset <= r.offset; sa = sa.slice(1)) @@ -631,7 +631,7 @@ static bool relax(InputSection &sec) { for (const SymbolAnchor &sa : sa) if (!sa.end) valueDelta[sa.d] = delta; - sa = makeArrayRef(aux.anchors); + sa = ArrayRef(aux.anchors); delta = 0; std::fill_n(aux.relocTypes.get(), sec.relocs().size(), R_RISCV_NONE); diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h index fcbfcfcae602..706f17b764c8 100644 --- a/lld/ELF/Config.h +++ b/lld/ELF/Config.h @@ -450,7 +450,7 @@ LLVM_LIBRARY_VISIBILITY extern Ctx ctx; // The first two elements of versionDefinitions represent VER_NDX_LOCAL and // VER_NDX_GLOBAL. This helper returns other elements. static inline ArrayRef namedVersionDefs() { - return llvm::makeArrayRef(config->versionDefinitions).slice(2); + return llvm::ArrayRef(config->versionDefinitions).slice(2); } void errorOrWarn(const Twine &msg); diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 1c2401650fb2..7e2a72acf8f6 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -2688,7 +2688,7 @@ void LinkerDriver::link(opt::InputArgList &args) { // compileBitcodeFiles may have produced lto.tmp object files. After this, no // more file will be added. - auto newObjectFiles = makeArrayRef(ctx.objectFiles).slice(numObjsBeforeLTO); + auto newObjectFiles = ArrayRef(ctx.objectFiles).slice(numObjsBeforeLTO); parallelForEach(newObjectFiles, [](ELFFileBase *file) { initSectionsAndLocalSyms(file, /*ignoreComdats=*/true); }); diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h index e3540e337f50..2b2f2c8fe7d2 100644 --- a/lld/ELF/InputFiles.h +++ b/lld/ELF/InputFiles.h @@ -174,11 +174,11 @@ public: ArrayRef getLocalSymbols() { if (numSymbols == 0) return {}; - return llvm::makeArrayRef(symbols.get() + 1, firstGlobal - 1); + return llvm::ArrayRef(symbols.get() + 1, firstGlobal - 1); } ArrayRef getGlobalSymbols() { - return llvm::makeArrayRef(symbols.get() + firstGlobal, - numSymbols - firstGlobal); + return llvm::ArrayRef(symbols.get() + firstGlobal, + numSymbols - firstGlobal); } MutableArrayRef getMutableGlobalSymbols() { return llvm::makeMutableArrayRef(symbols.get() + firstGlobal, diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp index 2bbe6433a7a4..df24f998bff6 100644 --- a/lld/ELF/InputSection.cpp +++ b/lld/ELF/InputSection.cpp @@ -44,7 +44,7 @@ template static ArrayRef getSectionContents(ObjFile &file, const typename ELFT::Shdr &hdr) { if (hdr.sh_type == SHT_NOBITS) - return makeArrayRef(nullptr, hdr.sh_size); + return ArrayRef(nullptr, hdr.sh_size); return check(file.getObj().getSectionContents(hdr)); } @@ -139,14 +139,14 @@ template RelsOrRelas InputSectionBase::relsOrRelas() const { typename ELFT::Shdr shdr = cast(file)->getELFShdrs()[relSecIdx]; if (shdr.sh_type == SHT_REL) { - ret.rels = makeArrayRef(reinterpret_cast( - file->mb.getBufferStart() + shdr.sh_offset), - shdr.sh_size / sizeof(typename ELFT::Rel)); + ret.rels = ArrayRef(reinterpret_cast( + file->mb.getBufferStart() + shdr.sh_offset), + shdr.sh_size / sizeof(typename ELFT::Rel)); } else { assert(shdr.sh_type == SHT_RELA); - ret.relas = makeArrayRef(reinterpret_cast( - file->mb.getBufferStart() + shdr.sh_offset), - shdr.sh_size / sizeof(typename ELFT::Rela)); + ret.relas = ArrayRef(reinterpret_cast( + file->mb.getBufferStart() + shdr.sh_offset), + shdr.sh_size / sizeof(typename ELFT::Rela)); } return ret; } diff --git a/lld/ELF/InputSection.h b/lld/ELF/InputSection.h index 26b6b4af00f5..356ccda2d743 100644 --- a/lld/ELF/InputSection.h +++ b/lld/ELF/InputSection.h @@ -241,7 +241,7 @@ public: template llvm::ArrayRef getDataAs() const { size_t s = content().size(); assert(s % sizeof(T) == 0); - return llvm::makeArrayRef((const T *)content().data(), s / sizeof(T)); + return llvm::ArrayRef((const T *)content().data(), s / sizeof(T)); } protected: diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp index 0892b71fc6ae..dc40f07ca6a1 100644 --- a/lld/ELF/OutputSections.cpp +++ b/lld/ELF/OutputSections.cpp @@ -397,7 +397,7 @@ template void OutputSection::maybeCompress() { // Split input into 1-MiB shards. constexpr size_t shardSize = 1 << 20; - auto shardsIn = split(makeArrayRef(buf.get(), size), shardSize); + auto shardsIn = split(ArrayRef(buf.get(), size), shardSize); const size_t numShards = shardsIn.size(); // Compress shards and compute Alder-32 checksums. Use Z_SYNC_FLUSH for all @@ -697,7 +697,7 @@ elf::getInputSections(const OutputSection &os, storage.insert(storage.end(), isd->sections.begin(), isd->sections.end()); } } - return storage.empty() ? ret : makeArrayRef(storage); + return storage.empty() ? ret : ArrayRef(storage); } // Sorts input sections by section name suffixes, so that .foo.N comes diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp index b7e5114a0ee1..b0ba9c219780 100644 --- a/lld/ELF/SyntheticSections.cpp +++ b/lld/ELF/SyntheticSections.cpp @@ -2810,7 +2810,7 @@ createSymbols( }); size_t numSymbols = 0; - for (ArrayRef v : makeArrayRef(symbols.get(), numShards)) + for (ArrayRef v : ArrayRef(symbols.get(), numShards)) numSymbols += v.size(); // The return type is a flattened vector, so we'll copy each vector @@ -3698,7 +3698,7 @@ static uint8_t getAbiVersion() { if (config->emachine == EM_AMDGPU && !ctx.objectFiles.empty()) { uint8_t ver = ctx.objectFiles[0]->abiVersion; - for (InputFile *file : makeArrayRef(ctx.objectFiles).slice(1)) + for (InputFile *file : ArrayRef(ctx.objectFiles).slice(1)) if (file->abiVersion != ver) error("incompatible ABI version: " + toString(file)); return ver; diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 5904a7b85eda..7b39e2466009 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -1360,11 +1360,11 @@ sortISDBySectionOrder(InputSectionDescription *isd, } isd->sections.clear(); - for (InputSection *isec : makeArrayRef(unorderedSections).slice(0, insPt)) + for (InputSection *isec : ArrayRef(unorderedSections).slice(0, insPt)) isd->sections.push_back(isec); for (std::pair p : orderedSections) isd->sections.push_back(p.first); - for (InputSection *isec : makeArrayRef(unorderedSections).slice(insPt)) + for (InputSection *isec : ArrayRef(unorderedSections).slice(insPt)) isd->sections.push_back(isec); } @@ -2919,7 +2919,7 @@ computeHash(llvm::MutableArrayRef hashBuf, }); // Write to the final output buffer. - hashFn(hashBuf.data(), makeArrayRef(hashes.get(), hashesSize)); + hashFn(hashBuf.data(), ArrayRef(hashes.get(), hashesSize)); } template void Writer::writeBuildId() { diff --git a/lldb/include/lldb/Utility/AnsiTerminal.h b/lldb/include/lldb/Utility/AnsiTerminal.h index caad56671537..67795971d2ca 100644 --- a/lldb/include/lldb/Utility/AnsiTerminal.h +++ b/lldb/include/lldb/Utility/AnsiTerminal.h @@ -137,7 +137,7 @@ inline std::string FormatAnsiTerminalCodes(llvm::StringRef format, #undef _TO_STR2 }; // clang-format on - auto codes = llvm::makeArrayRef(g_color_tokens); + auto codes = llvm::ArrayRef(g_color_tokens); static const char tok_hdr[] = "${ansi."; diff --git a/lldb/include/lldb/Utility/Args.h b/lldb/include/lldb/Utility/Args.h index 4661010d5105..40b9358484b6 100644 --- a/lldb/include/lldb/Utility/Args.h +++ b/lldb/include/lldb/Utility/Args.h @@ -167,7 +167,7 @@ public: /// have a nullptr const char * at the end, as the size of the list is /// embedded in the ArrayRef object. llvm::ArrayRef GetArgumentArrayRef() const { - return llvm::makeArrayRef(m_argv).drop_back(); + return llvm::ArrayRef(m_argv).drop_back(); } /// Appends a new argument to the end of the list argument list. diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index ae66ff951b34..851c80a21d8e 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -1645,7 +1645,7 @@ static llvm::ArrayRef GetCategoryArray(const char **categories) { size_t len = 0; while (categories[len] != nullptr) ++len; - return llvm::makeArrayRef(categories, len); + return llvm::ArrayRef(categories, len); } bool SBDebugger::EnableLog(const char *channel, const char **categories) { diff --git a/lldb/source/Breakpoint/BreakpointID.cpp b/lldb/source/Breakpoint/BreakpointID.cpp index 958c2dbe300c..b4a0a22f66c1 100644 --- a/lldb/source/Breakpoint/BreakpointID.cpp +++ b/lldb/source/Breakpoint/BreakpointID.cpp @@ -38,7 +38,7 @@ bool BreakpointID::IsValidIDExpression(llvm::StringRef str) { } llvm::ArrayRef BreakpointID::GetRangeSpecifiers() { - return llvm::makeArrayRef(g_range_specifiers); + return llvm::ArrayRef(g_range_specifiers); } void BreakpointID::GetDescription(Stream *s, lldb::DescriptionLevel level) { diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp index 2680c113c3b4..8c31630231b5 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.cpp +++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp @@ -56,7 +56,7 @@ public: ~BreakpointOptionGroup() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_modify_options); + return llvm::ArrayRef(g_breakpoint_modify_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, @@ -186,7 +186,7 @@ public: ~BreakpointDummyOptionGroup() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_dummy_options); + return llvm::ArrayRef(g_breakpoint_dummy_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, @@ -497,7 +497,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_set_options); + return llvm::ArrayRef(g_breakpoint_set_options); } // Instance variables to hold the values for command options. @@ -1159,7 +1159,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_list_options); + return llvm::ArrayRef(g_breakpoint_list_options); } // Instance variables to hold the values for command options. @@ -1282,7 +1282,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_clear_options); + return llvm::ArrayRef(g_breakpoint_clear_options); } // Instance variables to hold the values for command options. @@ -1439,7 +1439,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_delete_options); + return llvm::ArrayRef(g_breakpoint_delete_options); } // Instance variables to hold the values for command options. @@ -1565,7 +1565,7 @@ public: ~BreakpointNameOptionGroup() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_name_options); + return llvm::ArrayRef(g_breakpoint_name_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, @@ -1625,7 +1625,7 @@ public: ~BreakpointAccessOptionGroup() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_access_options); + return llvm::ArrayRef(g_breakpoint_access_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, ExecutionContext *execution_context) override { @@ -2188,7 +2188,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_read_options); + return llvm::ArrayRef(g_breakpoint_read_options); } void HandleOptionArgumentCompletion( @@ -2377,7 +2377,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_write_options); + return llvm::ArrayRef(g_breakpoint_write_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp index 499bc550af45..921243829fc6 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp @@ -317,7 +317,7 @@ are no syntax errors may indicate that a function was declared but never called. } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_command_add_options); + return llvm::ArrayRef(g_breakpoint_command_add_options); } // Instance variables to hold the values for command options. @@ -498,7 +498,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_breakpoint_command_delete_options); + return llvm::ArrayRef(g_breakpoint_command_delete_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp index 6f3b2927ded8..7a5755d8d235 100644 --- a/lldb/source/Commands/CommandObjectCommands.cpp +++ b/lldb/source/Commands/CommandObjectCommands.cpp @@ -119,7 +119,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_source_options); + return llvm::ArrayRef(g_source_options); } // Instance variables to hold the values for command options. @@ -213,7 +213,7 @@ protected: ~CommandOptions() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_alias_options); + return llvm::ArrayRef(g_alias_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, @@ -1057,7 +1057,7 @@ private: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_regex_options); + return llvm::ArrayRef(g_regex_options); } llvm::StringRef GetHelp() { return m_help; } @@ -1304,7 +1304,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_script_import_options); + return llvm::ArrayRef(g_script_import_options); } bool relative_to_command_file = false; bool silent = false; @@ -1455,7 +1455,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_script_add_options); + return llvm::ArrayRef(g_script_add_options); } // Instance variables to hold the values for command options. @@ -1898,7 +1898,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_container_add_options); + return llvm::ArrayRef(g_container_add_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectDiagnostics.cpp b/lldb/source/Commands/CommandObjectDiagnostics.cpp index 12d491529eba..dfde50a236ab 100644 --- a/lldb/source/Commands/CommandObjectDiagnostics.cpp +++ b/lldb/source/Commands/CommandObjectDiagnostics.cpp @@ -57,7 +57,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_diagnostics_dump_options); + return llvm::ArrayRef(g_diagnostics_dump_options); } FileSpec directory; diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp index e65e12fe557a..6f78fc9f6287 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.cpp +++ b/lldb/source/Commands/CommandObjectDisassemble.cpp @@ -204,7 +204,7 @@ Status CommandObjectDisassemble::CommandOptions::OptionParsingFinished( llvm::ArrayRef CommandObjectDisassemble::CommandOptions::GetDefinitions() { - return llvm::makeArrayRef(g_disassemble_options); + return llvm::ArrayRef(g_disassemble_options); } // CommandObjectDisassemble diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index b01e39f4ce3c..49d4976f7d3b 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -172,7 +172,7 @@ void CommandObjectExpression::CommandOptions::OptionParsingStarting( llvm::ArrayRef CommandObjectExpression::CommandOptions::GetDefinitions() { - return llvm::makeArrayRef(g_expression_options); + return llvm::ArrayRef(g_expression_options); } CommandObjectExpression::CommandObjectExpression( diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index af0f94ad6417..4a0d75202797 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -96,7 +96,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_frame_diag_options); + return llvm::ArrayRef(g_frame_diag_options); } // Options. @@ -254,7 +254,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_frame_select_options); + return llvm::ArrayRef(g_frame_select_options); } std::optional relative_frame_offset; @@ -778,7 +778,7 @@ private: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_frame_recognizer_add_options); + return llvm::ArrayRef(g_frame_recognizer_add_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectHelp.cpp b/lldb/source/Commands/CommandObjectHelp.cpp index c7a3bce1408b..10aa49ae01ba 100644 --- a/lldb/source/Commands/CommandObjectHelp.cpp +++ b/lldb/source/Commands/CommandObjectHelp.cpp @@ -71,7 +71,7 @@ CommandObjectHelp::~CommandObjectHelp() = default; llvm::ArrayRef CommandObjectHelp::CommandOptions::GetDefinitions() { - return llvm::makeArrayRef(g_help_options); + return llvm::ArrayRef(g_help_options); } bool CommandObjectHelp::DoExecute(Args &command, CommandReturnObject &result) { diff --git a/lldb/source/Commands/CommandObjectLog.cpp b/lldb/source/Commands/CommandObjectLog.cpp index 1b630e1e0bde..c63d8ce4f9e4 100644 --- a/lldb/source/Commands/CommandObjectLog.cpp +++ b/lldb/source/Commands/CommandObjectLog.cpp @@ -146,7 +146,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_log_enable_options); + return llvm::ArrayRef(g_log_enable_options); } FileSpec log_file; @@ -371,7 +371,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_log_dump_options); + return llvm::ArrayRef(g_log_dump_options); } FileSpec log_file; diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp index 78ee647c046a..6606f4564dc8 100644 --- a/lldb/source/Commands/CommandObjectMemory.cpp +++ b/lldb/source/Commands/CommandObjectMemory.cpp @@ -56,7 +56,7 @@ public: ~OptionGroupReadMemory() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_memory_read_options); + return llvm::ArrayRef(g_memory_read_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, @@ -904,7 +904,7 @@ public: ~OptionGroupFindMemory() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_memory_find_options); + return llvm::ArrayRef(g_memory_find_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, @@ -1207,7 +1207,7 @@ public: ~OptionGroupWriteMemory() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_memory_write_options); + return llvm::ArrayRef(g_memory_write_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, @@ -1665,7 +1665,7 @@ public: ~OptionGroupMemoryRegion() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_memory_region_options); + return llvm::ArrayRef(g_memory_region_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, diff --git a/lldb/source/Commands/CommandObjectMemoryTag.cpp b/lldb/source/Commands/CommandObjectMemoryTag.cpp index 98ab6201711d..fd0fd2919c95 100644 --- a/lldb/source/Commands/CommandObjectMemoryTag.cpp +++ b/lldb/source/Commands/CommandObjectMemoryTag.cpp @@ -144,7 +144,7 @@ public: ~OptionGroupTagWrite() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_memory_tag_write_options); + return llvm::ArrayRef(g_memory_tag_write_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp index d72dd06c31f9..69c44fe8c8c4 100644 --- a/lldb/source/Commands/CommandObjectPlatform.cpp +++ b/lldb/source/Commands/CommandObjectPlatform.cpp @@ -126,7 +126,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_permissions_options); + return llvm::ArrayRef(g_permissions_options); } // Instance variables to hold the values for command options. @@ -653,7 +653,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_platform_fread_options); + return llvm::ArrayRef(g_platform_fread_options); } // Instance variables to hold the values for command options. @@ -746,7 +746,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_platform_fwrite_options); + return llvm::ArrayRef(g_platform_fwrite_options); } // Instance variables to hold the values for command options. @@ -1468,7 +1468,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_platform_process_list_options); + return llvm::ArrayRef(g_platform_process_list_options); } // Instance variables to hold the values for command options. @@ -1622,7 +1622,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_platform_process_attach_options); + return llvm::ArrayRef(g_platform_process_attach_options); } // Options table: Required for subclasses of Options. @@ -1708,7 +1708,7 @@ public: ~CommandOptions() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_platform_shell_options); + return llvm::ArrayRef(g_platform_shell_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp index 353294856083..a45371f824b1 100644 --- a/lldb/source/Commands/CommandObjectProcess.cpp +++ b/lldb/source/Commands/CommandObjectProcess.cpp @@ -361,7 +361,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_attach_options); + return llvm::ArrayRef(g_process_attach_options); } ProcessAttachInfo attach_info; @@ -544,7 +544,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_continue_options); + return llvm::ArrayRef(g_process_continue_options); } uint32_t m_ignore = 0; @@ -838,7 +838,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_detach_options); + return llvm::ArrayRef(g_process_detach_options); } // Instance variables to hold the values for command options. @@ -921,7 +921,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_connect_options); + return llvm::ArrayRef(g_process_connect_options); } // Instance variables to hold the values for command options. @@ -1046,7 +1046,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_load_options); + return llvm::ArrayRef(g_process_load_options); } // Instance variables to hold the values for command options. @@ -1362,7 +1362,7 @@ public: ~CommandOptions() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_save_core_options); + return llvm::ArrayRef(g_process_save_core_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, @@ -1484,7 +1484,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_status_options); + return llvm::ArrayRef(g_process_status_options); } // Instance variables to hold the values for command options. @@ -1605,7 +1605,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_process_handle_options); + return llvm::ArrayRef(g_process_handle_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectRegister.cpp b/lldb/source/Commands/CommandObjectRegister.cpp index 12f8971f9265..c61a1f6e865a 100644 --- a/lldb/source/Commands/CommandObjectRegister.cpp +++ b/lldb/source/Commands/CommandObjectRegister.cpp @@ -240,7 +240,7 @@ protected: ~CommandOptions() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_register_read_options); + return llvm::ArrayRef(g_register_read_options); } void OptionParsingStarting(ExecutionContext *execution_context) override { diff --git a/lldb/source/Commands/CommandObjectScript.cpp b/lldb/source/Commands/CommandObjectScript.cpp index 2ed03e85b2d7..7e4f18a0d510 100644 --- a/lldb/source/Commands/CommandObjectScript.cpp +++ b/lldb/source/Commands/CommandObjectScript.cpp @@ -53,7 +53,7 @@ void CommandObjectScript::CommandOptions::OptionParsingStarting( llvm::ArrayRef CommandObjectScript::CommandOptions::GetDefinitions() { - return llvm::makeArrayRef(g_script_options); + return llvm::ArrayRef(g_script_options); } CommandObjectScript::CommandObjectScript(CommandInterpreter &interpreter) diff --git a/lldb/source/Commands/CommandObjectSession.cpp b/lldb/source/Commands/CommandObjectSession.cpp index f9ef1eb93443..7c7236e9793b 100644 --- a/lldb/source/Commands/CommandObjectSession.cpp +++ b/lldb/source/Commands/CommandObjectSession.cpp @@ -117,7 +117,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_history_options); + return llvm::ArrayRef(g_history_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectSettings.cpp b/lldb/source/Commands/CommandObjectSettings.cpp index 9420beaad372..d658e137a4fd 100644 --- a/lldb/source/Commands/CommandObjectSettings.cpp +++ b/lldb/source/Commands/CommandObjectSettings.cpp @@ -120,7 +120,7 @@ insert-before or insert-after."); } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_settings_set_options); + return llvm::ArrayRef(g_settings_set_options); } // Instance variables to hold the values for command options. @@ -359,7 +359,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_settings_write_options); + return llvm::ArrayRef(g_settings_write_options); } // Instance variables to hold the values for command options. @@ -453,7 +453,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_settings_read_options); + return llvm::ArrayRef(g_settings_read_options); } // Instance variables to hold the values for command options. @@ -1083,7 +1083,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_settings_clear_options); + return llvm::ArrayRef(g_settings_clear_options); } bool m_clear_all = false; diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp index 049b02b13e06..44561cfd736e 100644 --- a/lldb/source/Commands/CommandObjectSource.cpp +++ b/lldb/source/Commands/CommandObjectSource.cpp @@ -99,7 +99,7 @@ class CommandObjectSourceInfo : public CommandObjectParsed { } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_source_info_options); + return llvm::ArrayRef(g_source_info_options); } // Instance variables to hold the values for command options. @@ -696,7 +696,7 @@ class CommandObjectSourceList : public CommandObjectParsed { } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_source_list_options); + return llvm::ArrayRef(g_source_list_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectStats.cpp b/lldb/source/Commands/CommandObjectStats.cpp index c0f8ff4b0b58..b0b497cd80ba 100644 --- a/lldb/source/Commands/CommandObjectStats.cpp +++ b/lldb/source/Commands/CommandObjectStats.cpp @@ -88,7 +88,7 @@ class CommandObjectStatsDump : public CommandObjectParsed { } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_statistics_dump_options); + return llvm::ArrayRef(g_statistics_dump_options); } bool m_all_targets = false; diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index 86fd994ebb12..3d53de1d2d2b 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -153,7 +153,7 @@ public: ~OptionGroupDependents() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_target_dependents_options); + return llvm::ArrayRef(g_target_dependents_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, @@ -1970,7 +1970,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_target_modules_dump_symtab_options); + return llvm::ArrayRef(g_target_modules_dump_symtab_options); } SortOrder m_sort_order = eSortOrderNone; @@ -2422,7 +2422,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_target_modules_dump_options); + return llvm::ArrayRef(g_target_modules_dump_options); } bool m_verbose; @@ -2932,7 +2932,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_target_modules_list_options); + return llvm::ArrayRef(g_target_modules_list_options); } // Instance variables to hold the values for command options. @@ -3288,7 +3288,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_target_modules_show_unwind_options); + return llvm::ArrayRef(g_target_modules_show_unwind_options); } // Instance variables to hold the values for command options. @@ -3700,7 +3700,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_target_modules_lookup_options); + return llvm::ArrayRef(g_target_modules_lookup_options); } int m_type; // Should be a eLookupTypeXXX enum after parsing options @@ -4529,7 +4529,7 @@ public: ~CommandOptions() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_target_stop_hook_add_options); + return llvm::ArrayRef(g_target_stop_hook_add_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index 750bf74756f9..411f28d84a21 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -96,7 +96,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_backtrace_options); + return llvm::ArrayRef(g_thread_backtrace_options); } // Instance variables to hold the values for command options. @@ -254,7 +254,7 @@ public: ~ThreadStepScopeOptionGroup() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_step_scope_options); + return llvm::ArrayRef(g_thread_step_scope_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, @@ -874,7 +874,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_until_options); + return llvm::ArrayRef(g_thread_until_options); } uint32_t m_step_thread_idx = LLDB_INVALID_THREAD_ID; @@ -1270,7 +1270,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_info_options); + return llvm::ArrayRef(g_thread_info_options); } bool m_json_thread; @@ -1468,7 +1468,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_return_options); + return llvm::ArrayRef(g_thread_return_options); } bool m_from_expression = false; @@ -1640,7 +1640,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_jump_options); + return llvm::ArrayRef(g_thread_jump_options); } FileSpecList m_filenames; @@ -1774,7 +1774,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_plan_list_options); + return llvm::ArrayRef(g_thread_plan_list_options); } // Instance variables to hold the values for command options. @@ -2154,7 +2154,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_trace_dump_function_calls_options); + return llvm::ArrayRef(g_thread_trace_dump_function_calls_options); } static const size_t kDefaultCount = 20; @@ -2327,7 +2327,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_trace_dump_instructions_options); + return llvm::ArrayRef(g_thread_trace_dump_instructions_options); } static const size_t kDefaultCount = 20; @@ -2461,7 +2461,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_thread_trace_dump_info_options); + return llvm::ArrayRef(g_thread_trace_dump_info_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectTrace.cpp b/lldb/source/Commands/CommandObjectTrace.cpp index eaf99a46b5c2..ba8289cb68d3 100644 --- a/lldb/source/Commands/CommandObjectTrace.cpp +++ b/lldb/source/Commands/CommandObjectTrace.cpp @@ -64,7 +64,7 @@ public: }; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_trace_save_options); + return llvm::ArrayRef(g_trace_save_options); }; bool m_compact; @@ -168,7 +168,7 @@ public: } ArrayRef GetDefinitions() override { - return makeArrayRef(g_trace_load_options); + return ArrayRef(g_trace_load_options); } bool m_verbose; // Enable verbose logging for debugging purposes. @@ -262,7 +262,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_trace_dump_options); + return llvm::ArrayRef(g_trace_dump_options); } bool m_verbose; // Enable verbose logging for debugging purposes. @@ -327,7 +327,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_trace_schema_options); + return llvm::ArrayRef(g_trace_schema_options); } bool m_verbose; // Enable verbose logging for debugging purposes. diff --git a/lldb/source/Commands/CommandObjectType.cpp b/lldb/source/Commands/CommandObjectType.cpp index 6f09deae6a40..1120caa1da4c 100644 --- a/lldb/source/Commands/CommandObjectType.cpp +++ b/lldb/source/Commands/CommandObjectType.cpp @@ -118,7 +118,7 @@ private: void OptionParsingStarting(ExecutionContext *execution_context) override; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_summary_add_options); + return llvm::ArrayRef(g_type_summary_add_options); } // Instance variables to hold the values for command options. @@ -351,7 +351,7 @@ private: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_synth_add_options); + return llvm::ArrayRef(g_type_synth_add_options); } // Instance variables to hold the values for command options. @@ -508,7 +508,7 @@ private: ~CommandOptions() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_format_add_options); + return llvm::ArrayRef(g_type_format_add_options); } void OptionParsingStarting(ExecutionContext *execution_context) override { @@ -743,7 +743,7 @@ protected: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_formatter_delete_options); + return llvm::ArrayRef(g_type_formatter_delete_options); } // Instance variables to hold the values for command options. @@ -880,7 +880,7 @@ private: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_formatter_clear_options); + return llvm::ArrayRef(g_type_formatter_clear_options); } // Instance variables to hold the values for command options. @@ -999,7 +999,7 @@ class CommandObjectTypeFormatterList : public CommandObjectParsed { } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_formatter_list_options); + return llvm::ArrayRef(g_type_formatter_list_options); } // Instance variables to hold the values for command options. @@ -1700,7 +1700,7 @@ class CommandObjectTypeCategoryDefine : public CommandObjectParsed { } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_category_define_options); + return llvm::ArrayRef(g_type_category_define_options); } // Instance variables to hold the values for command options. @@ -1803,7 +1803,7 @@ class CommandObjectTypeCategoryEnable : public CommandObjectParsed { } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_category_enable_options); + return llvm::ArrayRef(g_type_category_enable_options); } // Instance variables to hold the values for command options. @@ -1980,7 +1980,7 @@ class CommandObjectTypeCategoryDisable : public CommandObjectParsed { } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_category_disable_options); + return llvm::ArrayRef(g_type_category_disable_options); } // Instance variables to hold the values for command options. @@ -2423,7 +2423,7 @@ private: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_filter_add_options); + return llvm::ArrayRef(g_type_filter_add_options); } // Instance variables to hold the values for command options. @@ -2639,7 +2639,7 @@ protected: ~CommandOptions() override = default; llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_type_lookup_options); + return llvm::ArrayRef(g_type_lookup_options); } Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_value, diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index 29f780092978..8df8aca04e4a 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -196,7 +196,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_list_options); + return llvm::ArrayRef(g_watchpoint_list_options); } // Instance variables to hold the values for command options. @@ -479,7 +479,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_delete_options); + return llvm::ArrayRef(g_watchpoint_delete_options); } // Instance variables to hold the values for command options. @@ -605,7 +605,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_ignore_options); + return llvm::ArrayRef(g_watchpoint_ignore_options); } // Instance variables to hold the values for command options. @@ -730,7 +730,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_modify_options); + return llvm::ArrayRef(g_watchpoint_modify_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectWatchpointCommand.cpp b/lldb/source/Commands/CommandObjectWatchpointCommand.cpp index 3264813b3d53..b33f403a6964 100644 --- a/lldb/source/Commands/CommandObjectWatchpointCommand.cpp +++ b/lldb/source/Commands/CommandObjectWatchpointCommand.cpp @@ -349,7 +349,7 @@ are no syntax errors may indicate that a function was declared but never called. } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_command_add_options); + return llvm::ArrayRef(g_watchpoint_command_add_options); } // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandOptionsProcessLaunch.cpp b/lldb/source/Commands/CommandOptionsProcessLaunch.cpp index 3c7f4b6c7585..85ad8ff5e071 100644 --- a/lldb/source/Commands/CommandOptionsProcessLaunch.cpp +++ b/lldb/source/Commands/CommandOptionsProcessLaunch.cpp @@ -145,5 +145,5 @@ Status CommandOptionsProcessLaunch::SetOptionValue( } llvm::ArrayRef CommandOptionsProcessLaunch::GetDefinitions() { - return llvm::makeArrayRef(g_process_launch_options); + return llvm::ArrayRef(g_process_launch_options); } diff --git a/lldb/source/Host/common/NativeProcessProtocol.cpp b/lldb/source/Host/common/NativeProcessProtocol.cpp index ac18cc9b09d9..590aba11d833 100644 --- a/lldb/source/Host/common/NativeProcessProtocol.cpp +++ b/lldb/source/Host/common/NativeProcessProtocol.cpp @@ -383,7 +383,7 @@ Status NativeProcessProtocol::RemoveSoftwareBreakpoint(lldb::addr_t addr) { } const auto &saved = it->second.saved_opcodes; // Make sure the breakpoint opcode exists at this address - if (makeArrayRef(curr_break_op) != it->second.breakpoint_opcodes) { + if (llvm::ArrayRef(curr_break_op) != it->second.breakpoint_opcodes) { if (curr_break_op != it->second.saved_opcodes) return Status("Original breakpoint trap is no longer in memory."); LLDB_LOG(log, @@ -483,7 +483,7 @@ NativeProcessProtocol::EnableSoftwareBreakpoint(lldb::addr_t addr, verify_bp_opcode_bytes.size(), verify_bytes_read); } - if (llvm::makeArrayRef(verify_bp_opcode_bytes.data(), verify_bytes_read) != + if (llvm::ArrayRef(verify_bp_opcode_bytes.data(), verify_bytes_read) != *expected_trap) { return llvm::createStringError( llvm::inconvertibleErrorCode(), @@ -514,39 +514,39 @@ NativeProcessProtocol::GetSoftwareBreakpointTrapOpcode(size_t size_hint) { switch (GetArchitecture().GetMachine()) { case llvm::Triple::aarch64: case llvm::Triple::aarch64_32: - return llvm::makeArrayRef(g_aarch64_opcode); + return llvm::ArrayRef(g_aarch64_opcode); case llvm::Triple::x86: case llvm::Triple::x86_64: - return llvm::makeArrayRef(g_i386_opcode); + return llvm::ArrayRef(g_i386_opcode); case llvm::Triple::mips: case llvm::Triple::mips64: - return llvm::makeArrayRef(g_mips64_opcode); + return llvm::ArrayRef(g_mips64_opcode); case llvm::Triple::mipsel: case llvm::Triple::mips64el: - return llvm::makeArrayRef(g_mips64el_opcode); + return llvm::ArrayRef(g_mips64el_opcode); case llvm::Triple::systemz: - return llvm::makeArrayRef(g_s390x_opcode); + return llvm::ArrayRef(g_s390x_opcode); case llvm::Triple::ppc: case llvm::Triple::ppc64: - return llvm::makeArrayRef(g_ppc_opcode); + return llvm::ArrayRef(g_ppc_opcode); case llvm::Triple::ppc64le: - return llvm::makeArrayRef(g_ppcle_opcode); + return llvm::ArrayRef(g_ppcle_opcode); case llvm::Triple::riscv32: case llvm::Triple::riscv64: { - return size_hint == 2 ? llvm::makeArrayRef(g_riscv_opcode_c) - : llvm::makeArrayRef(g_riscv_opcode); + return size_hint == 2 ? llvm::ArrayRef(g_riscv_opcode_c) + : llvm::ArrayRef(g_riscv_opcode); } case llvm::Triple::loongarch32: case llvm::Triple::loongarch64: - return llvm::makeArrayRef(g_loongarch_opcode); + return llvm::ArrayRef(g_loongarch_opcode); default: return llvm::createStringError(llvm::inconvertibleErrorCode(), @@ -653,7 +653,7 @@ Status NativeProcessProtocol::ReadMemoryWithoutTrap(lldb::addr_t addr, llvm::makeMutableArrayRef(static_cast(buf), bytes_read); for (const auto &pair : m_software_breakpoints) { lldb::addr_t bp_addr = pair.first; - auto saved_opcodes = makeArrayRef(pair.second.saved_opcodes); + auto saved_opcodes = llvm::ArrayRef(pair.second.saved_opcodes); if (bp_addr + saved_opcodes.size() < addr || addr + bytes_read <= bp_addr) continue; // Breakpoint not in range, ignore diff --git a/lldb/source/Interpreter/OptionGroupArchitecture.cpp b/lldb/source/Interpreter/OptionGroupArchitecture.cpp index 00541b7198d2..3925f835885f 100644 --- a/lldb/source/Interpreter/OptionGroupArchitecture.cpp +++ b/lldb/source/Interpreter/OptionGroupArchitecture.cpp @@ -20,7 +20,7 @@ static constexpr OptionDefinition g_option_table[] = { }; llvm::ArrayRef OptionGroupArchitecture::GetDefinitions() { - return llvm::makeArrayRef(g_option_table); + return llvm::ArrayRef(g_option_table); } bool OptionGroupArchitecture::GetArchitecture(Platform *platform, diff --git a/lldb/source/Interpreter/OptionGroupFormat.cpp b/lldb/source/Interpreter/OptionGroupFormat.cpp index f44f82c63b08..6b56ad2ea819 100644 --- a/lldb/source/Interpreter/OptionGroupFormat.cpp +++ b/lldb/source/Interpreter/OptionGroupFormat.cpp @@ -58,7 +58,7 @@ OptionGroupFormat::OptionGroupFormat( } llvm::ArrayRef OptionGroupFormat::GetDefinitions() { - auto result = llvm::makeArrayRef(m_option_definitions); + auto result = llvm::ArrayRef(m_option_definitions); if (m_byte_size.GetDefaultValue() < UINT64_MAX) { if (m_count.GetDefaultValue() < UINT64_MAX) return result; diff --git a/lldb/source/Interpreter/OptionGroupMemoryTag.cpp b/lldb/source/Interpreter/OptionGroupMemoryTag.cpp index 6752b6c8acf2..c6efab7c3871 100644 --- a/lldb/source/Interpreter/OptionGroupMemoryTag.cpp +++ b/lldb/source/Interpreter/OptionGroupMemoryTag.cpp @@ -32,7 +32,7 @@ OptionGroupMemoryTag::OptionGroupMemoryTag(bool note_binary /*=false*/) : "Include memory tags in output."} {} llvm::ArrayRef OptionGroupMemoryTag::GetDefinitions() { - return llvm::makeArrayRef(m_option_definition); + return llvm::ArrayRef(m_option_definition); } Status diff --git a/lldb/source/Interpreter/OptionGroupOutputFile.cpp b/lldb/source/Interpreter/OptionGroupOutputFile.cpp index 6a626bd63014..f0044606e1de 100644 --- a/lldb/source/Interpreter/OptionGroupOutputFile.cpp +++ b/lldb/source/Interpreter/OptionGroupOutputFile.cpp @@ -27,7 +27,7 @@ static constexpr OptionDefinition g_option_table[] = { }; llvm::ArrayRef OptionGroupOutputFile::GetDefinitions() { - return llvm::makeArrayRef(g_option_table); + return llvm::ArrayRef(g_option_table); } Status diff --git a/lldb/source/Interpreter/OptionGroupUUID.cpp b/lldb/source/Interpreter/OptionGroupUUID.cpp index 5b4c24a0a32b..7a0efbab0398 100644 --- a/lldb/source/Interpreter/OptionGroupUUID.cpp +++ b/lldb/source/Interpreter/OptionGroupUUID.cpp @@ -19,7 +19,7 @@ static constexpr OptionDefinition g_option_table[] = { }; llvm::ArrayRef OptionGroupUUID::GetDefinitions() { - return llvm::makeArrayRef(g_option_table); + return llvm::ArrayRef(g_option_table); } Status OptionGroupUUID::SetOptionValue(uint32_t option_idx, diff --git a/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp b/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp index 57b593020b14..294665fa6b45 100644 --- a/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp +++ b/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp @@ -62,7 +62,7 @@ static const OptionDefinition g_option_table[] = { llvm::ArrayRef OptionGroupValueObjectDisplay::GetDefinitions() { - return llvm::makeArrayRef(g_option_table); + return llvm::ArrayRef(g_option_table); } Status OptionGroupValueObjectDisplay::SetOptionValue( diff --git a/lldb/source/Interpreter/OptionGroupVariable.cpp b/lldb/source/Interpreter/OptionGroupVariable.cpp index fb92c51ef79e..0e35a641361b 100644 --- a/lldb/source/Interpreter/OptionGroupVariable.cpp +++ b/lldb/source/Interpreter/OptionGroupVariable.cpp @@ -131,7 +131,7 @@ void OptionGroupVariable::OptionParsingStarting( #define NUM_FRAME_OPTS 3 llvm::ArrayRef OptionGroupVariable::GetDefinitions() { - auto result = llvm::makeArrayRef(g_variable_options); + auto result = llvm::ArrayRef(g_variable_options); // Show the "--no-args", "--no-locals" and "--show-globals" options if we are // showing frame specific options if (include_frame_options) diff --git a/lldb/source/Interpreter/OptionGroupWatchpoint.cpp b/lldb/source/Interpreter/OptionGroupWatchpoint.cpp index eb9842add28c..5559e82d4722 100644 --- a/lldb/source/Interpreter/OptionGroupWatchpoint.cpp +++ b/lldb/source/Interpreter/OptionGroupWatchpoint.cpp @@ -111,5 +111,5 @@ void OptionGroupWatchpoint::OptionParsingStarting( } llvm::ArrayRef OptionGroupWatchpoint::GetDefinitions() { - return llvm::makeArrayRef(g_option_table); + return llvm::ArrayRef(g_option_table); } diff --git a/lldb/source/Interpreter/OptionValueBoolean.cpp b/lldb/source/Interpreter/OptionValueBoolean.cpp index 62845c14bd13..4ac2ed5efe75 100644 --- a/lldb/source/Interpreter/OptionValueBoolean.cpp +++ b/lldb/source/Interpreter/OptionValueBoolean.cpp @@ -72,7 +72,7 @@ void OptionValueBoolean::AutoComplete(CommandInterpreter &interpreter, llvm::StringRef autocomplete_entries[] = {"true", "false", "on", "off", "yes", "no", "1", "0"}; - auto entries = llvm::makeArrayRef(autocomplete_entries); + auto entries = llvm::ArrayRef(autocomplete_entries); // only suggest "true" or "false" by default if (request.GetCursorArgumentPrefix().empty()) diff --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp index f202d581dd5f..3386acd9080f 100644 --- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp +++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp @@ -271,7 +271,7 @@ bool ABISysV_arc::PrepareTrivialCall(Thread &thread, addr_t sp, addr_t pc, reg_value[byte_index++] = 0; } - RegisterValue reg_val_obj(llvm::makeArrayRef(reg_value, reg_size), + RegisterValue reg_val_obj(llvm::ArrayRef(reg_value, reg_size), eByteOrderLittle); if (!reg_ctx->WriteRegister( reg_ctx->GetRegisterInfo(eRegisterKindGeneric, reg_index), diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index cbf3c6530a60..7d376f2b9ac1 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -868,7 +868,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_objc_classtable_dump_options); + return llvm::ArrayRef(g_objc_classtable_dump_options); } OptionValueBoolean m_verbose; diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp index 06cb1b63db9f..e168241fb2c9 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp @@ -4113,7 +4113,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_reduction_bp_set_options); + return llvm::ArrayRef(g_renderscript_reduction_bp_set_options); } bool ParseReductionTypes(llvm::StringRef option_val, @@ -4265,7 +4265,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_kernel_bp_set_options); + return llvm::ArrayRef(g_renderscript_kernel_bp_set_options); } RSCoordinate m_coord; @@ -4545,7 +4545,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_runtime_alloc_dump_options); + return llvm::ArrayRef(g_renderscript_runtime_alloc_dump_options); } FileSpec m_outfile; @@ -4663,7 +4663,7 @@ public: void OptionParsingStarting(ExecutionContext *exe_ctx) override { m_id = 0; } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_runtime_alloc_list_options); + return llvm::ArrayRef(g_renderscript_runtime_alloc_list_options); } uint32_t m_id = 0; diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index 5b76239b20e9..9131367bf223 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -447,8 +447,8 @@ bool ObjectFileELF::MagicBytesMatch(DataBufferSP &data_sp, } static uint32_t calc_crc32(uint32_t init, const DataExtractor &data) { - return llvm::crc32( - init, llvm::makeArrayRef(data.GetDataStart(), data.GetByteSize())); + return llvm::crc32(init, + llvm::ArrayRef(data.GetDataStart(), data.GetByteSize())); } uint32_t ObjectFileELF::CalculateELFNotesSegmentsCRC32( diff --git a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp index 756c7a8ee2cc..06eb6ff9cafb 100644 --- a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp +++ b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp @@ -72,7 +72,7 @@ GetWasmString(llvm::DataExtractor &data, llvm::DataExtractor::Cursor &c) { return std::nullopt; } - llvm::StringRef str = toStringRef(makeArrayRef(str_storage)); + llvm::StringRef str = toStringRef(llvm::ArrayRef(str_storage)); return ConstString(str); } diff --git a/lldb/source/Plugins/Process/FreeBSD/NativeProcessFreeBSD.cpp b/lldb/source/Plugins/Process/FreeBSD/NativeProcessFreeBSD.cpp index 5d73ec3457e3..dbaa83fd15d7 100644 --- a/lldb/source/Plugins/Process/FreeBSD/NativeProcessFreeBSD.cpp +++ b/lldb/source/Plugins/Process/FreeBSD/NativeProcessFreeBSD.cpp @@ -417,9 +417,9 @@ NativeProcessFreeBSD::GetSoftwareBreakpointTrapOpcode(size_t size_hint) { case llvm::Triple::arm: switch (size_hint) { case 2: - return llvm::makeArrayRef(g_thumb_opcode); + return llvm::ArrayRef(g_thumb_opcode); case 4: - return llvm::makeArrayRef(g_arm_opcode); + return llvm::ArrayRef(g_arm_opcode); default: return llvm::createStringError(llvm::inconvertibleErrorCode(), "Unrecognised trap opcode size hint!"); diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 5fb26ad1f11c..a0e5d25a233b 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -1513,9 +1513,9 @@ NativeProcessLinux::GetSoftwareBreakpointTrapOpcode(size_t size_hint) { case llvm::Triple::arm: switch (size_hint) { case 2: - return llvm::makeArrayRef(g_thumb_opcode); + return llvm::ArrayRef(g_thumb_opcode); case 4: - return llvm::makeArrayRef(g_arm_opcode); + return llvm::ArrayRef(g_arm_opcode); default: return llvm::createStringError(llvm::inconvertibleErrorCode(), "Unrecognised trap opcode size hint!"); diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp index 569e3a0785fe..1c46df79c7d0 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp @@ -217,9 +217,9 @@ RegisterInfoPOSIX_arm64::RegisterInfoPOSIX_arm64( if (m_opt_regsets.AnySet(eRegsetMaskDynamic)) { llvm::ArrayRef reg_infos_ref = - llvm::makeArrayRef(m_register_info_p, m_register_info_count); + llvm::ArrayRef(m_register_info_p, m_register_info_count); llvm::ArrayRef reg_sets_ref = - llvm::makeArrayRef(m_register_set_p, m_register_set_count); + llvm::ArrayRef(m_register_set_p, m_register_set_count); llvm::copy(reg_infos_ref, std::back_inserter(m_dynamic_reg_infos)); llvm::copy(reg_sets_ref, std::back_inserter(m_dynamic_reg_sets)); @@ -333,7 +333,7 @@ uint32_t RegisterInfoPOSIX_arm64::ConfigureVectorLength(uint32_t sve_vq) { m_per_vq_reg_infos[sve_vq]; if (reg_info_ref.empty()) { - reg_info_ref = llvm::makeArrayRef(m_register_info_p, m_register_info_count); + reg_info_ref = llvm::ArrayRef(m_register_info_p, m_register_info_count); uint32_t offset = SVE_REGS_DEFAULT_OFFSET_LINUX; reg_info_ref[fpu_fpsr].byte_offset = offset; diff --git a/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp index 7570ba02312d..792be0ed31c1 100644 --- a/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp @@ -295,11 +295,11 @@ NativeProcessWindows::GetSoftwareBreakpointTrapOpcode(size_t size_hint) { switch (GetArchitecture().GetMachine()) { case llvm::Triple::aarch64: - return llvm::makeArrayRef(g_aarch64_opcode); + return llvm::ArrayRef(g_aarch64_opcode); case llvm::Triple::arm: case llvm::Triple::thumb: - return llvm::makeArrayRef(g_thumb_opcode); + return llvm::ArrayRef(g_thumb_opcode); default: return NativeProcessProtocol::GetSoftwareBreakpointTrapOpcode(size_hint); diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp index 30d6d786b865..921c149b9762 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp @@ -2307,7 +2307,7 @@ GDBRemoteCommunicationServerLLGS::Handle_P(StringExtractorGDBRemote &packet) { // Build the reginfos response. StreamGDBRemote response; - RegisterValue reg_value(makeArrayRef(reg_bytes, reg_size), + RegisterValue reg_value(ArrayRef(reg_bytes, reg_size), m_current_process->GetArchitecture().GetByteOrder()); Status error = reg_context.WriteRegister(reg_info, reg_value); if (error.Fail()) { diff --git a/lldb/source/Plugins/Process/minidump/MinidumpTypes.cpp b/lldb/source/Plugins/Process/minidump/MinidumpTypes.cpp index b2f1fe952332..5b919828428f 100644 --- a/lldb/source/Plugins/Process/minidump/MinidumpTypes.cpp +++ b/lldb/source/Plugins/Process/minidump/MinidumpTypes.cpp @@ -72,7 +72,7 @@ MinidumpMemoryDescriptor64::ParseMemory64List(llvm::ArrayRef &data) { return {}; return std::make_pair( - llvm::makeArrayRef( + llvm::ArrayRef( reinterpret_cast(data.data()), *mem_ranges_count), *base_rva); diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp index e31d8bb769f8..855a67aae1b5 100644 --- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp +++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp @@ -40,7 +40,7 @@ static constexpr lldb::ScriptLanguage g_supported_script_languages[] = { bool ScriptedProcess::IsScriptLanguageSupported(lldb::ScriptLanguage language) { llvm::ArrayRef supported_languages = - llvm::makeArrayRef(g_supported_script_languages); + llvm::ArrayRef(g_supported_script_languages); return llvm::is_contained(supported_languages, language); } diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp index 85366d3f9f4b..95182c97baff 100644 --- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp +++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp @@ -557,7 +557,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_enable_option_table); + return llvm::ArrayRef(g_enable_option_table); } StructuredData::DictionarySP BuildConfigurationData(bool enabled) { diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp index cf483286a66d..a0e8dcc3d4f3 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp @@ -22,8 +22,8 @@ DWARFDataExtractor::GetDWARFOffset(lldb::offset_t *offset_ptr) const { } llvm::DWARFDataExtractor DWARFDataExtractor::GetAsLLVM() const { - return llvm::DWARFDataExtractor( - llvm::makeArrayRef(GetDataStart(), GetByteSize()), - GetByteOrder() == lldb::eByteOrderLittle, GetAddressByteSize()); + return llvm::DWARFDataExtractor(llvm::ArrayRef(GetDataStart(), GetByteSize()), + GetByteOrder() == lldb::eByteOrderLittle, + GetAddressByteSize()); } } // namespace lldb_private diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/DWARFLocationExpression.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/DWARFLocationExpression.cpp index a5bf04c2e121..9623daa416bb 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/DWARFLocationExpression.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/DWARFLocationExpression.cpp @@ -249,7 +249,7 @@ DWARFExpression lldb_private::npdb::MakeConstantLocationExpression( Value.U = constant.getZExtValue(); } - bytes = llvm::makeArrayRef(reinterpret_cast(&Value), 8) + bytes = llvm::ArrayRef(reinterpret_cast(&Value), 8) .take_front(size); buffer->CopyData(bytes.data(), size); DataExtractor extractor(buffer, lldb::eByteOrderLittle, address_size); diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp index 0073db939a3e..1e9e1be62e3b 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp @@ -1189,7 +1189,7 @@ clang::QualType PdbAstBuilder::CreateFunctionType( llvm::cantFail( TypeDeserializer::deserializeAs(args_cvt, args)); - llvm::ArrayRef arg_indices = llvm::makeArrayRef(args.ArgIndices); + llvm::ArrayRef arg_indices = llvm::ArrayRef(args.ArgIndices); bool is_variadic = IsCVarArgsFunction(arg_indices); if (is_variadic) arg_indices = arg_indices.drop_back(); diff --git a/lldb/source/Plugins/Trace/intel-pt/CommandObjectTraceStartIntelPT.cpp b/lldb/source/Plugins/Trace/intel-pt/CommandObjectTraceStartIntelPT.cpp index eb40b5d8ffc1..d4f7dc354e9f 100644 --- a/lldb/source/Plugins/Trace/intel-pt/CommandObjectTraceStartIntelPT.cpp +++ b/lldb/source/Plugins/Trace/intel-pt/CommandObjectTraceStartIntelPT.cpp @@ -70,7 +70,7 @@ void CommandObjectThreadTraceStartIntelPT::CommandOptions:: llvm::ArrayRef CommandObjectThreadTraceStartIntelPT::CommandOptions::GetDefinitions() { - return llvm::makeArrayRef(g_thread_trace_start_intel_pt_options); + return llvm::ArrayRef(g_thread_trace_start_intel_pt_options); } bool CommandObjectThreadTraceStartIntelPT::DoExecuteOnThreads( @@ -155,7 +155,7 @@ void CommandObjectProcessTraceStartIntelPT::CommandOptions:: llvm::ArrayRef CommandObjectProcessTraceStartIntelPT::CommandOptions::GetDefinitions() { - return llvm::makeArrayRef(g_process_trace_start_intel_pt_options); + return llvm::ArrayRef(g_process_trace_start_intel_pt_options); } bool CommandObjectProcessTraceStartIntelPT::DoExecute( diff --git a/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.cpp b/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.cpp index cc4ebfff6595..33d05ee2ac13 100644 --- a/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.cpp +++ b/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.cpp @@ -59,7 +59,7 @@ void CommandObjectThreadTraceExportCTF::CommandOptions::OptionParsingStarting( llvm::ArrayRef CommandObjectThreadTraceExportCTF::CommandOptions::GetDefinitions() { - return llvm::makeArrayRef(g_thread_trace_export_ctf_options); + return llvm::ArrayRef(g_thread_trace_export_ctf_options); } bool CommandObjectThreadTraceExportCTF::DoExecute(Args &command, diff --git a/lldb/source/Symbol/UnwindPlan.cpp b/lldb/source/Symbol/UnwindPlan.cpp index 6e1ead9adfb0..e258a4e3d82f 100644 --- a/lldb/source/Symbol/UnwindPlan.cpp +++ b/lldb/source/Symbol/UnwindPlan.cpp @@ -148,7 +148,7 @@ void UnwindPlan::Row::RegisterLocation::Dump(Stream &s, if (m_type == atDWARFExpression) s.PutChar('['); DumpDWARFExpr( - s, llvm::makeArrayRef(m_location.expr.opcodes, m_location.expr.length), + s, llvm::ArrayRef(m_location.expr.opcodes, m_location.expr.length), thread); if (m_type == atDWARFExpression) s.PutChar(']'); @@ -202,8 +202,7 @@ void UnwindPlan::Row::FAValue::Dump(Stream &s, const UnwindPlan *unwind_plan, s.PutChar(']'); break; case isDWARFExpression: - DumpDWARFExpr(s, - llvm::makeArrayRef(m_value.expr.opcodes, m_value.expr.length), + DumpDWARFExpr(s, llvm::ArrayRef(m_value.expr.opcodes, m_value.expr.length), thread); break; case unspecified: diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp index ed2f934bc607..1ddd7596280e 100644 --- a/lldb/source/Target/Platform.cpp +++ b/lldb/source/Target/Platform.cpp @@ -1358,7 +1358,7 @@ static constexpr OptionDefinition g_caching_option_table[] = { }; llvm::ArrayRef OptionGroupPlatformRSync::GetDefinitions() { - return llvm::makeArrayRef(g_rsync_option_table); + return llvm::ArrayRef(g_rsync_option_table); } void OptionGroupPlatformRSync::OptionParsingStarting( @@ -1406,7 +1406,7 @@ Platform::SetThreadCreationBreakpoint(lldb_private::Target &target) { } llvm::ArrayRef OptionGroupPlatformSSH::GetDefinitions() { - return llvm::makeArrayRef(g_ssh_option_table); + return llvm::ArrayRef(g_ssh_option_table); } void OptionGroupPlatformSSH::OptionParsingStarting( @@ -1439,7 +1439,7 @@ OptionGroupPlatformSSH::SetOptionValue(uint32_t option_idx, } llvm::ArrayRef OptionGroupPlatformCaching::GetDefinitions() { - return llvm::makeArrayRef(g_caching_option_table); + return llvm::ArrayRef(g_caching_option_table); } void OptionGroupPlatformCaching::OptionParsingStarting( diff --git a/lldb/source/Target/StackFrameRecognizer.cpp b/lldb/source/Target/StackFrameRecognizer.cpp index 73d22d5bb4e6..0ccb1ae9c031 100644 --- a/lldb/source/Target/StackFrameRecognizer.cpp +++ b/lldb/source/Target/StackFrameRecognizer.cpp @@ -77,7 +77,7 @@ void StackFrameRecognizerManager::ForEach( symbol_name = entry.symbol_regexp->GetText().str(); callback(entry.recognizer_id, entry.recognizer->GetName(), module_name, - llvm::makeArrayRef(ConstString(symbol_name)), true); + llvm::ArrayRef(ConstString(symbol_name)), true); } else { callback(entry.recognizer_id, entry.recognizer->GetName(), diff --git a/lldb/source/Utility/Args.cpp b/lldb/source/Utility/Args.cpp index 09477936352a..2d50b43bc241 100644 --- a/lldb/source/Utility/Args.cpp +++ b/lldb/source/Utility/Args.cpp @@ -312,7 +312,7 @@ void Args::AppendArguments(const char **argv) { assert(m_argv.size() == m_entries.size() + 1); assert(m_argv.back() == nullptr); m_argv.pop_back(); - for (auto arg : llvm::makeArrayRef(argv, argc)) { + for (auto arg : llvm::ArrayRef(argv, argc)) { m_entries.emplace_back(arg, '\0'); m_argv.push_back(m_entries.back().data()); } @@ -358,7 +358,7 @@ void Args::DeleteArgumentAtIndex(size_t idx) { void Args::SetArguments(size_t argc, const char **argv) { Clear(); - auto args = llvm::makeArrayRef(argv, argc); + auto args = llvm::ArrayRef(argv, argc); m_entries.resize(argc); m_argv.resize(argc + 1); for (size_t i = 0; i < args.size(); ++i) { diff --git a/lldb/source/Utility/StringList.cpp b/lldb/source/Utility/StringList.cpp index ee1f157f16f1..98923a07db70 100644 --- a/lldb/source/Utility/StringList.cpp +++ b/lldb/source/Utility/StringList.cpp @@ -108,7 +108,7 @@ std::string StringList::LongestCommonPrefix() { if (m_strings.empty()) return {}; - auto args = llvm::makeArrayRef(m_strings); + auto args = llvm::ArrayRef(m_strings); llvm::StringRef prefix = args.front(); for (auto arg : args.drop_front()) { size_t count = 0; diff --git a/lldb/tools/driver/Driver.cpp b/lldb/tools/driver/Driver.cpp index c61df7d62f08..31b81730b557 100644 --- a/lldb/tools/driver/Driver.cpp +++ b/lldb/tools/driver/Driver.cpp @@ -757,7 +757,7 @@ int main(int argc, char const *argv[]) { LLDBOptTable T; unsigned MissingArgIndex; unsigned MissingArgCount; - ArrayRef arg_arr = makeArrayRef(argv + 1, argc - 1); + ArrayRef arg_arr = ArrayRef(argv + 1, argc - 1); opt::InputArgList input_args = T.ParseArgs(arg_arr, MissingArgIndex, MissingArgCount); llvm::StringRef argv0 = llvm::sys::path::filename(argv[0]); diff --git a/lldb/tools/lldb-vscode/lldb-vscode.cpp b/lldb/tools/lldb-vscode/lldb-vscode.cpp index 31b364bbf434..62711b6eda14 100644 --- a/lldb/tools/lldb-vscode/lldb-vscode.cpp +++ b/lldb/tools/lldb-vscode/lldb-vscode.cpp @@ -3227,7 +3227,7 @@ int main(int argc, char *argv[]) { LLDBVSCodeOptTable T; unsigned MAI, MAC; - llvm::ArrayRef ArgsArr = llvm::makeArrayRef(argv + 1, argc); + llvm::ArrayRef ArgsArr = llvm::ArrayRef(argv + 1, argc); llvm::opt::InputArgList input_args = T.ParseArgs(ArgsArr, MAI, MAC); if (input_args.hasArg(OPT_help)) { diff --git a/lldb/unittests/TestingSupport/Host/NativeProcessTestUtils.h b/lldb/unittests/TestingSupport/Host/NativeProcessTestUtils.h index 4efb18397d9d..a610b37a6b38 100644 --- a/lldb/unittests/TestingSupport/Host/NativeProcessTestUtils.h +++ b/lldb/unittests/TestingSupport/Host/NativeProcessTestUtils.h @@ -86,7 +86,7 @@ public: Status WriteMemory(addr_t Addr, const void *Buf, size_t Size, size_t &BytesWritten) /*override*/ { auto ExpectedBytes = this->WriteMemory( - Addr, llvm::makeArrayRef(static_cast(Buf), Size)); + Addr, llvm::ArrayRef(static_cast(Buf), Size)); if (!ExpectedBytes) { BytesWritten = 0; return Status(ExpectedBytes.takeError()); diff --git a/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp index 0c582ed4f100..b1abd37c5725 100644 --- a/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp @@ -34,7 +34,6 @@ using llvm::ArrayRef; using llvm::cast; using llvm::dyn_cast; using llvm::isa; -using llvm::makeArrayRef; using llvm::ScopedHashTableScope; using llvm::SmallVector; using llvm::StringRef; @@ -226,8 +225,8 @@ private: } // Otherwise, this return operation has zero operands. - builder.create(location, expr ? makeArrayRef(expr) - : ArrayRef()); + builder.create(location, + expr ? ArrayRef(expr) : ArrayRef()); return mlir::success(); } @@ -267,7 +266,7 @@ private: // This is the actual attribute that holds the list of values for this // tensor literal. auto dataAttribute = - mlir::DenseElementsAttr::get(dataType, llvm::makeArrayRef(data)); + mlir::DenseElementsAttr::get(dataType, llvm::ArrayRef(data)); // Build the MLIR op `toy.constant`. This invokes the `ConstantOp::build` // method. diff --git a/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp index 0c582ed4f100..b1abd37c5725 100644 --- a/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp @@ -34,7 +34,6 @@ using llvm::ArrayRef; using llvm::cast; using llvm::dyn_cast; using llvm::isa; -using llvm::makeArrayRef; using llvm::ScopedHashTableScope; using llvm::SmallVector; using llvm::StringRef; @@ -226,8 +225,8 @@ private: } // Otherwise, this return operation has zero operands. - builder.create(location, expr ? makeArrayRef(expr) - : ArrayRef()); + builder.create(location, + expr ? ArrayRef(expr) : ArrayRef()); return mlir::success(); } @@ -267,7 +266,7 @@ private: // This is the actual attribute that holds the list of values for this // tensor literal. auto dataAttribute = - mlir::DenseElementsAttr::get(dataType, llvm::makeArrayRef(data)); + mlir::DenseElementsAttr::get(dataType, llvm::ArrayRef(data)); // Build the MLIR op `toy.constant`. This invokes the `ConstantOp::build` // method. diff --git a/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp index 834836153002..0b200f105fbf 100644 --- a/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp @@ -34,7 +34,6 @@ using llvm::ArrayRef; using llvm::cast; using llvm::dyn_cast; using llvm::isa; -using llvm::makeArrayRef; using llvm::ScopedHashTableScope; using llvm::SmallVector; using llvm::StringRef; @@ -230,8 +229,8 @@ private: } // Otherwise, this return operation has zero operands. - builder.create(location, expr ? makeArrayRef(expr) - : ArrayRef()); + builder.create(location, + expr ? ArrayRef(expr) : ArrayRef()); return mlir::success(); } @@ -271,7 +270,7 @@ private: // This is the actual attribute that holds the list of values for this // tensor literal. auto dataAttribute = - mlir::DenseElementsAttr::get(dataType, llvm::makeArrayRef(data)); + mlir::DenseElementsAttr::get(dataType, llvm::ArrayRef(data)); // Build the MLIR op `toy.constant`. This invokes the `ConstantOp::build` // method. diff --git a/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp index 4c0abc0270b6..c52f5bd2c59b 100644 --- a/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp +++ b/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp @@ -177,7 +177,7 @@ struct ConstantOpLowering : public OpRewritePattern { if (dimension == valueShape.size()) { rewriter.create( loc, rewriter.create(loc, *valueIt++), alloc, - llvm::makeArrayRef(indices)); + llvm::ArrayRef(indices)); return; } diff --git a/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp index 834836153002..0b200f105fbf 100644 --- a/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp @@ -34,7 +34,6 @@ using llvm::ArrayRef; using llvm::cast; using llvm::dyn_cast; using llvm::isa; -using llvm::makeArrayRef; using llvm::ScopedHashTableScope; using llvm::SmallVector; using llvm::StringRef; @@ -230,8 +229,8 @@ private: } // Otherwise, this return operation has zero operands. - builder.create(location, expr ? makeArrayRef(expr) - : ArrayRef()); + builder.create(location, + expr ? ArrayRef(expr) : ArrayRef()); return mlir::success(); } @@ -271,7 +270,7 @@ private: // This is the actual attribute that holds the list of values for this // tensor literal. auto dataAttribute = - mlir::DenseElementsAttr::get(dataType, llvm::makeArrayRef(data)); + mlir::DenseElementsAttr::get(dataType, llvm::ArrayRef(data)); // Build the MLIR op `toy.constant`. This invokes the `ConstantOp::build` // method. diff --git a/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp index 4c0abc0270b6..c52f5bd2c59b 100644 --- a/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp +++ b/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp @@ -177,7 +177,7 @@ struct ConstantOpLowering : public OpRewritePattern { if (dimension == valueShape.size()) { rewriter.create( loc, rewriter.create(loc, *valueIt++), alloc, - llvm::makeArrayRef(indices)); + llvm::ArrayRef(indices)); return; } diff --git a/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp index 834836153002..0b200f105fbf 100644 --- a/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp @@ -34,7 +34,6 @@ using llvm::ArrayRef; using llvm::cast; using llvm::dyn_cast; using llvm::isa; -using llvm::makeArrayRef; using llvm::ScopedHashTableScope; using llvm::SmallVector; using llvm::StringRef; @@ -230,8 +229,8 @@ private: } // Otherwise, this return operation has zero operands. - builder.create(location, expr ? makeArrayRef(expr) - : ArrayRef()); + builder.create(location, + expr ? ArrayRef(expr) : ArrayRef()); return mlir::success(); } @@ -271,7 +270,7 @@ private: // This is the actual attribute that holds the list of values for this // tensor literal. auto dataAttribute = - mlir::DenseElementsAttr::get(dataType, llvm::makeArrayRef(data)); + mlir::DenseElementsAttr::get(dataType, llvm::ArrayRef(data)); // Build the MLIR op `toy.constant`. This invokes the `ConstantOp::build` // method. diff --git a/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp index 4c0abc0270b6..c52f5bd2c59b 100644 --- a/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp +++ b/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp @@ -177,7 +177,7 @@ struct ConstantOpLowering : public OpRewritePattern { if (dimension == valueShape.size()) { rewriter.create( loc, rewriter.create(loc, *valueIt++), alloc, - llvm::makeArrayRef(indices)); + llvm::ArrayRef(indices)); return; } diff --git a/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp index ed367b84d817..279ae0375918 100644 --- a/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp @@ -34,7 +34,6 @@ using llvm::ArrayRef; using llvm::cast; using llvm::dyn_cast; using llvm::isa; -using llvm::makeArrayRef; using llvm::ScopedHashTableScope; using llvm::SmallVector; using llvm::StringRef; @@ -363,8 +362,8 @@ private: } // Otherwise, this return operation has zero operands. - builder.create(location, expr ? makeArrayRef(expr) - : ArrayRef()); + builder.create(location, + expr ? ArrayRef(expr) : ArrayRef()); return mlir::success(); } @@ -401,7 +400,7 @@ private: // This is the actual attribute that holds the list of values for this // tensor literal. - return mlir::DenseElementsAttr::get(dataType, llvm::makeArrayRef(data)); + return mlir::DenseElementsAttr::get(dataType, llvm::ArrayRef(data)); } mlir::DenseElementsAttr getConstantAttr(NumberExprAST &lit) { // The type of this attribute is tensor of 64-bit floating-point with no @@ -412,7 +411,7 @@ private: // This is the actual attribute that holds the list of values for this // tensor literal. return mlir::DenseElementsAttr::get(dataType, - llvm::makeArrayRef(lit.getValue())); + llvm::ArrayRef(lit.getValue())); } /// Emit a constant for a struct literal. It will be emitted as an array of /// other literals in an Attribute attached to a `toy.struct_constant` diff --git a/mlir/include/mlir/Dialect/Shape/IR/ShapeOps.td b/mlir/include/mlir/Dialect/Shape/IR/ShapeOps.td index dd38e746cf00..b8a3fb7b4f19 100644 --- a/mlir/include/mlir/Dialect/Shape/IR/ShapeOps.td +++ b/mlir/include/mlir/Dialect/Shape/IR/ShapeOps.td @@ -98,7 +98,7 @@ def Shape_BroadcastOp : Shape_Op<"broadcast", [Commutative, Pure]> { let builders = [OpBuilder<(ins "::mlir::Type":$result, "::mlir::Value":$lhs, "::mlir::Value":$rhs, "/*optional*/ ::mlir::StringAttr":$error), [{ - build($_builder, $_state, result, ::llvm::makeArrayRef({lhs, rhs}), + build($_builder, $_state, result, ::llvm::ArrayRef({lhs, rhs}), error); }]> ]; @@ -211,7 +211,7 @@ def Shape_ShapeEqOp : Shape_Op<"shape_eq", [Pure, Commutative]> { // Convenience builder alias for the binary version. let builders = [ OpBuilder<(ins "::mlir::Value":$lhs, "::mlir::Value":$rhs), - [{ build($_builder, $_state, ::llvm::makeArrayRef({lhs, rhs})); }]>, + [{ build($_builder, $_state, ::llvm::ArrayRef({lhs, rhs})); }]>, ]; let assemblyFormat = "$shapes attr-dict `:` type($shapes)"; @@ -277,7 +277,7 @@ def Shape_IsBroadcastableOp : Shape_Op<"is_broadcastable", [Commutative]> { let builders = [ OpBuilder<(ins "::mlir::Value":$lhs, "::mlir::Value":$rhs), - [{ build($_builder, $_state, ::llvm::makeArrayRef({lhs, rhs})); }]>, + [{ build($_builder, $_state, ::llvm::ArrayRef({lhs, rhs})); }]>, ]; let hasFolder = 1; @@ -972,7 +972,7 @@ def Shape_CstrBroadcastableOp : Shape_Op<"cstr_broadcastable", [Commutative]> { let builders = [ OpBuilder<(ins "::mlir::Value":$lhs, "::mlir::Value":$rhs), - [{ build($_builder, $_state, ::llvm::makeArrayRef({lhs, rhs})); }]>, + [{ build($_builder, $_state, ::llvm::ArrayRef({lhs, rhs})); }]>, ]; let hasCanonicalizer = 1; diff --git a/mlir/include/mlir/Dialect/Tosa/Utils/ShapeUtils.h b/mlir/include/mlir/Dialect/Tosa/Utils/ShapeUtils.h index 413988d796f7..e417d5d292ff 100644 --- a/mlir/include/mlir/Dialect/Tosa/Utils/ShapeUtils.h +++ b/mlir/include/mlir/Dialect/Tosa/Utils/ShapeUtils.h @@ -68,7 +68,7 @@ struct ValueKnowledge { Type getType() const { if (hasRank) - return RankedTensorType::get(llvm::makeArrayRef(sizes), dtype); + return RankedTensorType::get(llvm::ArrayRef(sizes), dtype); return UnrankedTensorType::get(dtype); } diff --git a/mlir/include/mlir/IR/AsmState.h b/mlir/include/mlir/IR/AsmState.h index 1f12f7c6ad4c..761c817f1e82 100644 --- a/mlir/include/mlir/IR/AsmState.h +++ b/mlir/include/mlir/IR/AsmState.h @@ -144,8 +144,7 @@ public: /// known to be of the correct type. template ArrayRef getDataAs() const { - return llvm::makeArrayRef((const T *)data.data(), - data.size() / sizeof(T)); + return llvm::ArrayRef((const T *)data.data(), data.size() / sizeof(T)); } /// Return a mutable reference to the raw underlying data of this blob. diff --git a/mlir/include/mlir/IR/AttrTypeBase.td b/mlir/include/mlir/IR/AttrTypeBase.td index 44d3b2412415..dd17f0866760 100644 --- a/mlir/include/mlir/IR/AttrTypeBase.td +++ b/mlir/include/mlir/IR/AttrTypeBase.td @@ -368,7 +368,7 @@ class OptionalArrayRefParameter : OptionalParameter<"::llvm::ArrayRef<" # arrayOf # ">", desc> { let allocator = [{$_dst = $_allocator.copyInto($_self);}]; let cppStorageType = "::llvm::SmallVector<" # arrayOf # ">"; - let comparator = "::llvm::makeArrayRef($_lhs) == ::llvm::makeArrayRef($_rhs)"; + let comparator = "::llvm::ArrayRef($_lhs) == ::llvm::ArrayRef($_rhs)"; } // For classes which require allocation and have their own allocateInto method. diff --git a/mlir/include/mlir/IR/BuiltinAttributes.h b/mlir/include/mlir/IR/BuiltinAttributes.h index f9365ef5cd48..814a1fcef9d1 100644 --- a/mlir/include/mlir/IR/BuiltinAttributes.h +++ b/mlir/include/mlir/IR/BuiltinAttributes.h @@ -125,7 +125,7 @@ public: is_valid_cpp_fp_type::value || detail::is_complex_t::value>> static DenseElementsAttr get(const ShapedType &type, T value) { - return get(type, llvm::makeArrayRef(value)); + return get(type, llvm::ArrayRef(value)); } /// Constructs a dense complex elements attribute from an array of complex @@ -911,7 +911,7 @@ public: /// simply wraps the DenseElementsAttr::get calls. template static DenseFPElementsAttr get(const ShapedType &type, Arg &&arg) { - return DenseElementsAttr::get(type, llvm::makeArrayRef(arg)) + return DenseElementsAttr::get(type, llvm::ArrayRef(arg)) .template cast(); } template @@ -953,7 +953,7 @@ public: /// simply wraps the DenseElementsAttr::get calls. template static DenseIntElementsAttr get(const ShapedType &type, Arg &&arg) { - return DenseElementsAttr::get(type, llvm::makeArrayRef(arg)) + return DenseElementsAttr::get(type, llvm::ArrayRef(arg)) .template cast(); } template diff --git a/mlir/include/mlir/IR/OpBase.td b/mlir/include/mlir/IR/OpBase.td index 91a8d2b7e2d0..a659371981cd 100644 --- a/mlir/include/mlir/IR/OpBase.td +++ b/mlir/include/mlir/IR/OpBase.td @@ -1363,7 +1363,7 @@ class SignlessIntElementsAttr : IntElementsAttrBase< let constBuilderCall = "::mlir::DenseElementsAttr::get(" "::mlir::RankedTensorType::get({}, " "$_builder.getIntegerType(" # width # ")), " - "::llvm::makeArrayRef($0)).cast<::mlir::DenseIntElementsAttr>()"; + "::llvm::ArrayRef($0)).cast<::mlir::DenseIntElementsAttr>()"; } def I32ElementsAttr : SignlessIntElementsAttr<32>; @@ -1384,7 +1384,7 @@ class RankedSignlessIntElementsAttr dims> : let constBuilderCall = "::mlir::DenseIntElementsAttr::get(" "::mlir::RankedTensorType::get({" # !interleave(dims, ", ") # - "}, $_builder.getIntegerType(" # width # ")), ::llvm::makeArrayRef($0))"; + "}, $_builder.getIntegerType(" # width # ")), ::llvm::ArrayRef($0))"; } class RankedI32ElementsAttr dims> : @@ -1404,7 +1404,7 @@ class FloatElementsAttr : ElementsAttrBase< // Note that this is only constructing scalar elements attribute. let constBuilderCall = "::mlir::DenseElementsAttr::get(" "::mlir::RankedTensorType::get({}, $_builder.getF" # width # "Type())," - "::llvm::makeArrayRef($0))"; + "::llvm::ArrayRef($0))"; let convertFromStorage = "$_self"; } @@ -1429,7 +1429,7 @@ class RankedFloatElementsAttr dims> : ElementsAttrBase< let constBuilderCall = "::mlir::DenseElementsAttr::get(" "::mlir::RankedTensorType::get({" # !interleave(dims, ", ") # "}, $_builder.getF" # width # "Type()), " - "::llvm::makeArrayRef($0)).cast<::mlir::DenseFPElementsAttr>()"; + "::llvm::ArrayRef($0)).cast<::mlir::DenseFPElementsAttr>()"; let convertFromStorage = "$_self"; } diff --git a/mlir/include/mlir/IR/OpDefinition.h b/mlir/include/mlir/IR/OpDefinition.h index 002bec3df374..c185750e5bce 100644 --- a/mlir/include/mlir/IR/OpDefinition.h +++ b/mlir/include/mlir/IR/OpDefinition.h @@ -1251,8 +1251,7 @@ struct HasParent { return op->emitOpError() << "expects parent op " << (sizeof...(ParentOpTypes) != 1 ? "to be one of '" : "'") - << llvm::makeArrayRef({ParentOpTypes::getOperationName()...}) - << "'"; + << llvm::ArrayRef({ParentOpTypes::getOperationName()...}) << "'"; } }; }; diff --git a/mlir/lib/Analysis/Presburger/PresburgerSpace.cpp b/mlir/lib/Analysis/Presburger/PresburgerSpace.cpp index a79b229318a1..648860c7756e 100644 --- a/mlir/lib/Analysis/Presburger/PresburgerSpace.cpp +++ b/mlir/lib/Analysis/Presburger/PresburgerSpace.cpp @@ -170,10 +170,9 @@ bool PresburgerSpace::isAligned(const PresburgerSpace &other, "alignment."); ArrayRef kindAttachments = - makeArrayRef(identifiers) - .slice(getVarKindOffset(kind), getNumVarKind(kind)); + ArrayRef(identifiers).slice(getVarKindOffset(kind), getNumVarKind(kind)); ArrayRef otherKindAttachments = - makeArrayRef(other.identifiers) + ArrayRef(other.identifiers) .slice(other.getVarKindOffset(kind), other.getNumVarKind(kind)); return kindAttachments == otherKindAttachments; } diff --git a/mlir/lib/AsmParser/AsmParserState.cpp b/mlir/lib/AsmParser/AsmParserState.cpp index 4860b101d598..29e1f40c5de8 100644 --- a/mlir/lib/AsmParser/AsmParserState.cpp +++ b/mlir/lib/AsmParser/AsmParserState.cpp @@ -102,7 +102,7 @@ AsmParserState &AsmParserState::operator=(AsmParserState &&other) { // Access State auto AsmParserState::getBlockDefs() const -> iterator_range { - return llvm::make_pointee_range(llvm::makeArrayRef(impl->blocks)); + return llvm::make_pointee_range(llvm::ArrayRef(impl->blocks)); } auto AsmParserState::getBlockDef(Block *block) const @@ -112,7 +112,7 @@ auto AsmParserState::getBlockDef(Block *block) const } auto AsmParserState::getOpDefs() const -> iterator_range { - return llvm::make_pointee_range(llvm::makeArrayRef(impl->operations)); + return llvm::make_pointee_range(llvm::ArrayRef(impl->operations)); } auto AsmParserState::getOpDef(Operation *op) const diff --git a/mlir/lib/AsmParser/AttributeParser.cpp b/mlir/lib/AsmParser/AttributeParser.cpp index 835341c71b60..166834139991 100644 --- a/mlir/lib/AsmParser/AttributeParser.cpp +++ b/mlir/lib/AsmParser/AttributeParser.cpp @@ -575,7 +575,7 @@ DenseElementsAttr TensorLiteralParser::getAttr(SMLoc loc, ShapedType type) { return nullptr; if (isComplex) { // If this is a complex, treat the parsed values as complex values. - auto complexData = llvm::makeArrayRef( + auto complexData = llvm::ArrayRef( reinterpret_cast *>(intValues.data()), intValues.size() / 2); return DenseElementsAttr::get(type, complexData); @@ -589,7 +589,7 @@ DenseElementsAttr TensorLiteralParser::getAttr(SMLoc loc, ShapedType type) { return nullptr; if (isComplex) { // If this is a complex, treat the parsed values as complex values. - auto complexData = llvm::makeArrayRef( + auto complexData = llvm::ArrayRef( reinterpret_cast *>(floatValues.data()), floatValues.size() / 2); return DenseElementsAttr::get(type, complexData); diff --git a/mlir/lib/Bindings/Python/IRCore.cpp b/mlir/lib/Bindings/Python/IRCore.cpp index f2aa8da5bc79..f1c7be5e4301 100644 --- a/mlir/lib/Bindings/Python/IRCore.cpp +++ b/mlir/lib/Bindings/Python/IRCore.cpp @@ -2496,7 +2496,7 @@ void mlir::python::populateIRCore(py::module &m) { throw py::value_error("No caller frames provided"); MlirLocation caller = frames.back().get(); for (const PyLocation &frame : - llvm::reverse(llvm::makeArrayRef(frames).drop_back())) + llvm::reverse(llvm::ArrayRef(frames).drop_back())) caller = mlirLocationCallSiteGet(frame.get(), caller); return PyLocation(context->getRef(), mlirLocationCallSiteGet(callee.get(), caller)); diff --git a/mlir/lib/Bytecode/Reader/BytecodeReader.cpp b/mlir/lib/Bytecode/Reader/BytecodeReader.cpp index d19dd91b3340..5860fd42a2bb 100644 --- a/mlir/lib/Bytecode/Reader/BytecodeReader.cpp +++ b/mlir/lib/Bytecode/Reader/BytecodeReader.cpp @@ -919,8 +919,8 @@ public: if (failed(reader.parseVarInt(dataSize)) || failed(reader.parseBytes(dataSize, data))) return failure(); - result = llvm::makeArrayRef(reinterpret_cast(data.data()), - data.size()); + result = llvm::ArrayRef(reinterpret_cast(data.data()), + data.size()); return success(); } diff --git a/mlir/lib/CAPI/Dialect/Quant.cpp b/mlir/lib/CAPI/Dialect/Quant.cpp index 483536508198..065ab3e36635 100644 --- a/mlir/lib/CAPI/Dialect/Quant.cpp +++ b/mlir/lib/CAPI/Dialect/Quant.cpp @@ -167,7 +167,7 @@ MlirType mlirUniformQuantizedPerAxisTypeGet( int64_t storageTypeMax) { return wrap(quant::UniformQuantizedPerAxisType::get( flags, unwrap(storageType), unwrap(expressedType), - llvm::makeArrayRef(scales, nDims), llvm::makeArrayRef(zeroPoints, nDims), + llvm::ArrayRef(scales, nDims), llvm::ArrayRef(zeroPoints, nDims), quantizedDimension, storageTypeMin, storageTypeMax)); } diff --git a/mlir/lib/CAPI/IR/AffineMap.cpp b/mlir/lib/CAPI/IR/AffineMap.cpp index 85557bc576f6..1889765ef864 100644 --- a/mlir/lib/CAPI/IR/AffineMap.cpp +++ b/mlir/lib/CAPI/IR/AffineMap.cpp @@ -68,7 +68,7 @@ MlirAffineMap mlirAffineMapMinorIdentityGet(MlirContext ctx, intptr_t dims, MlirAffineMap mlirAffineMapPermutationGet(MlirContext ctx, intptr_t size, unsigned *permutation) { return wrap(AffineMap::getPermutationMap( - llvm::makeArrayRef(permutation, static_cast(size)), unwrap(ctx))); + llvm::ArrayRef(permutation, static_cast(size)), unwrap(ctx))); } bool mlirAffineMapIsIdentity(MlirAffineMap affineMap) { diff --git a/mlir/lib/CAPI/IR/BuiltinAttributes.cpp b/mlir/lib/CAPI/IR/BuiltinAttributes.cpp index e392d053b2e2..b6ee4af79c87 100644 --- a/mlir/lib/CAPI/IR/BuiltinAttributes.cpp +++ b/mlir/lib/CAPI/IR/BuiltinAttributes.cpp @@ -301,13 +301,13 @@ MlirAttribute mlirElementsAttrGetValue(MlirAttribute attr, intptr_t rank, uint64_t *idxs) { return wrap(unwrap(attr) .cast() - .getValues()[llvm::makeArrayRef(idxs, rank)]); + .getValues()[llvm::ArrayRef(idxs, rank)]); } bool mlirElementsAttrIsValidIndex(MlirAttribute attr, intptr_t rank, uint64_t *idxs) { return unwrap(attr).cast().isValidIndex( - llvm::makeArrayRef(idxs, rank)); + llvm::ArrayRef(idxs, rank)); } int64_t mlirElementsAttrGetNumElements(MlirAttribute attr) { @@ -520,9 +520,8 @@ template static MlirAttribute getDenseAttribute(MlirType shapedType, intptr_t numElements, const T *elements) { - return wrap( - DenseElementsAttr::get(unwrap(shapedType).cast(), - llvm::makeArrayRef(elements, numElements))); + return wrap(DenseElementsAttr::get(unwrap(shapedType).cast(), + llvm::ArrayRef(elements, numElements))); } MlirAttribute mlirDenseElementsAttrUInt8Get(MlirType shapedType, @@ -710,7 +709,7 @@ static MlirAttribute getDenseResource(MlirType shapedType, MlirStringRef name, intptr_t numElements, const T *elements) { return wrap(U::get(unwrap(shapedType).cast(), unwrap(name), UnmanagedAsmResourceBlob::allocateInferAlign( - llvm::makeArrayRef(elements, numElements)))); + llvm::ArrayRef(elements, numElements)))); } MLIR_CAPI_EXPORTED MlirAttribute mlirUnmanagedDenseBoolResourceElementsAttrGet( diff --git a/mlir/lib/CAPI/IR/BuiltinTypes.cpp b/mlir/lib/CAPI/IR/BuiltinTypes.cpp index 6b6ba6e95b72..73a3ec414876 100644 --- a/mlir/lib/CAPI/IR/BuiltinTypes.cpp +++ b/mlir/lib/CAPI/IR/BuiltinTypes.cpp @@ -187,15 +187,14 @@ bool mlirTypeIsAVector(MlirType type) { return unwrap(type).isa(); } MlirType mlirVectorTypeGet(intptr_t rank, const int64_t *shape, MlirType elementType) { - return wrap( - VectorType::get(llvm::makeArrayRef(shape, static_cast(rank)), - unwrap(elementType))); + return wrap(VectorType::get(llvm::ArrayRef(shape, static_cast(rank)), + unwrap(elementType))); } MlirType mlirVectorTypeGetChecked(MlirLocation loc, intptr_t rank, const int64_t *shape, MlirType elementType) { return wrap(VectorType::getChecked( - unwrap(loc), llvm::makeArrayRef(shape, static_cast(rank)), + unwrap(loc), llvm::ArrayRef(shape, static_cast(rank)), unwrap(elementType))); } @@ -215,9 +214,9 @@ bool mlirTypeIsAUnrankedTensor(MlirType type) { MlirType mlirRankedTensorTypeGet(intptr_t rank, const int64_t *shape, MlirType elementType, MlirAttribute encoding) { - return wrap(RankedTensorType::get( - llvm::makeArrayRef(shape, static_cast(rank)), unwrap(elementType), - unwrap(encoding))); + return wrap( + RankedTensorType::get(llvm::ArrayRef(shape, static_cast(rank)), + unwrap(elementType), unwrap(encoding))); } MlirType mlirRankedTensorTypeGetChecked(MlirLocation loc, intptr_t rank, @@ -225,7 +224,7 @@ MlirType mlirRankedTensorTypeGetChecked(MlirLocation loc, intptr_t rank, MlirType elementType, MlirAttribute encoding) { return wrap(RankedTensorType::getChecked( - unwrap(loc), llvm::makeArrayRef(shape, static_cast(rank)), + unwrap(loc), llvm::ArrayRef(shape, static_cast(rank)), unwrap(elementType), unwrap(encoding))); } @@ -252,7 +251,7 @@ MlirType mlirMemRefTypeGet(MlirType elementType, intptr_t rank, const int64_t *shape, MlirAttribute layout, MlirAttribute memorySpace) { return wrap(MemRefType::get( - llvm::makeArrayRef(shape, static_cast(rank)), unwrap(elementType), + llvm::ArrayRef(shape, static_cast(rank)), unwrap(elementType), mlirAttributeIsNull(layout) ? MemRefLayoutAttrInterface() : unwrap(layout).cast(), @@ -264,7 +263,7 @@ MlirType mlirMemRefTypeGetChecked(MlirLocation loc, MlirType elementType, MlirAttribute layout, MlirAttribute memorySpace) { return wrap(MemRefType::getChecked( - unwrap(loc), llvm::makeArrayRef(shape, static_cast(rank)), + unwrap(loc), llvm::ArrayRef(shape, static_cast(rank)), unwrap(elementType), mlirAttributeIsNull(layout) ? MemRefLayoutAttrInterface() @@ -275,9 +274,9 @@ MlirType mlirMemRefTypeGetChecked(MlirLocation loc, MlirType elementType, MlirType mlirMemRefTypeContiguousGet(MlirType elementType, intptr_t rank, const int64_t *shape, MlirAttribute memorySpace) { - return wrap(MemRefType::get( - llvm::makeArrayRef(shape, static_cast(rank)), unwrap(elementType), - MemRefLayoutAttrInterface(), unwrap(memorySpace))); + return wrap(MemRefType::get(llvm::ArrayRef(shape, static_cast(rank)), + unwrap(elementType), MemRefLayoutAttrInterface(), + unwrap(memorySpace))); } MlirType mlirMemRefTypeContiguousGetChecked(MlirLocation loc, @@ -285,7 +284,7 @@ MlirType mlirMemRefTypeContiguousGetChecked(MlirLocation loc, const int64_t *shape, MlirAttribute memorySpace) { return wrap(MemRefType::getChecked( - unwrap(loc), llvm::makeArrayRef(shape, static_cast(rank)), + unwrap(loc), llvm::ArrayRef(shape, static_cast(rank)), unwrap(elementType), MemRefLayoutAttrInterface(), unwrap(memorySpace))); } diff --git a/mlir/lib/CAPI/IR/IntegerSet.cpp b/mlir/lib/CAPI/IR/IntegerSet.cpp index 701d70353614..43d48e415d27 100644 --- a/mlir/lib/CAPI/IR/IntegerSet.cpp +++ b/mlir/lib/CAPI/IR/IntegerSet.cpp @@ -49,7 +49,7 @@ MlirIntegerSet mlirIntegerSetGet(MlirContext context, intptr_t numDims, return wrap(IntegerSet::get( static_cast(numDims), static_cast(numSymbols), mlirConstraints, - llvm::makeArrayRef(eqFlags, static_cast(numConstraints)))); + llvm::ArrayRef(eqFlags, static_cast(numConstraints)))); } MlirIntegerSet diff --git a/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp b/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp index a8e2d28e98c6..f1a32fa8fde6 100644 --- a/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp +++ b/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp @@ -275,7 +275,7 @@ public: auto integerSet = op.getIntegerSet(); Value zeroConstant = rewriter.create(loc, 0); SmallVector operands(op.getOperands()); - auto operandsRef = llvm::makeArrayRef(operands); + auto operandsRef = llvm::ArrayRef(operands); // Calculate cond as a conjunction without short-circuiting. Value cond = nullptr; @@ -419,7 +419,7 @@ public: LogicalResult matchAndRewrite(AffineDmaStartOp op, PatternRewriter &rewriter) const override { SmallVector operands(op.getOperands()); - auto operandsRef = llvm::makeArrayRef(operands); + auto operandsRef = llvm::ArrayRef(operands); // Expand affine map for DMA source memref. auto maybeExpandedSrcMap = expandAffineMap( diff --git a/mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp b/mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp index 873edc30099e..d48cae30629d 100644 --- a/mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp +++ b/mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp @@ -977,9 +977,9 @@ LogicalResult AddUIExtendedOpPattern::matchAndRewrite( adaptor.getRhs()); Value sumResult = rewriter.create( - loc, result, llvm::makeArrayRef(0)); + loc, result, llvm::ArrayRef(0)); Value carryValue = rewriter.create( - loc, result, llvm::makeArrayRef(1)); + loc, result, llvm::ArrayRef(1)); // Convert the carry value to boolean. Value one = spirv::ConstantOp::getOne(dstElemTy, loc, rewriter); @@ -1002,9 +1002,9 @@ LogicalResult MulIExtendedOpPattern::matchAndRewrite( rewriter.create(loc, adaptor.getLhs(), adaptor.getRhs()); Value low = rewriter.create(loc, result, - llvm::makeArrayRef(0)); - Value high = rewriter.create( - loc, result, llvm::makeArrayRef(1)); + llvm::ArrayRef(0)); + Value high = rewriter.create(loc, result, + llvm::ArrayRef(1)); rewriter.replaceOp(op, {low, high}); return success(); diff --git a/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp b/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp index d0c9105f4b26..c51daeb05ac5 100644 --- a/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp +++ b/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp @@ -57,7 +57,7 @@ static void createPrintMsg(OpBuilder &builder, Location loc, ModuleOp moduleOp, auto dataAttrType = RankedTensorType::get( {static_cast(elementVals.size())}, builder.getI8Type()); auto dataAttr = - DenseElementsAttr::get(dataAttrType, llvm::makeArrayRef(elementVals)); + DenseElementsAttr::get(dataAttrType, llvm::ArrayRef(elementVals)); auto arrayTy = LLVM::LLVMArrayType::get(IntegerType::get(ctx, 8), elementVals.size()); std::string symbolName = generateGlobalMsgSymbolName(moduleOp); diff --git a/mlir/lib/Conversion/LLVMCommon/MemRefBuilder.cpp b/mlir/lib/Conversion/LLVMCommon/MemRefBuilder.cpp index d10c17e5fb5e..f808e3dabf5c 100644 --- a/mlir/lib/Conversion/LLVMCommon/MemRefBuilder.cpp +++ b/mlir/lib/Conversion/LLVMCommon/MemRefBuilder.cpp @@ -139,7 +139,7 @@ Value MemRefDescriptor::size(OpBuilder &builder, Location loc, Value pos, // Copy size values to stack-allocated memory. auto one = createIndexAttrConstant(builder, loc, indexType, 1); auto sizes = builder.create( - loc, value, llvm::makeArrayRef({kSizePosInMemRefDescriptor})); + loc, value, llvm::ArrayRef({kSizePosInMemRefDescriptor})); auto sizesPtr = builder.create(loc, arrayPtrTy, one, /*alignment=*/0); builder.create(loc, sizes, sizesPtr); diff --git a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp index 62a1fa5f10a9..36ed389132cf 100644 --- a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp +++ b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp @@ -1534,7 +1534,7 @@ static void fillInStridesForCollapsedMemDescriptor( for (auto &en : llvm::enumerate(reassociation)) { rewriter.setInsertionPoint(op); auto dstIndex = en.index(); - ArrayRef ref = llvm::makeArrayRef(en.value()); + ArrayRef ref = llvm::ArrayRef(en.value()); while (srcShape[ref.back()] == 1 && ref.size() > 1) ref = ref.drop_back(); if (!ShapedType::isDynamic(srcShape[ref.back()]) || ref.size() == 1) { diff --git a/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp b/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp index da505884554b..0dbf67e0b69f 100644 --- a/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp +++ b/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp @@ -335,7 +335,7 @@ struct VectorReductionPattern final // Reduce them. Value result = values.front(); - for (Value next : llvm::makeArrayRef(values).drop_front()) { + for (Value next : llvm::ArrayRef(values).drop_front()) { switch (reduceOp.getKind()) { #define INT_AND_FLOAT_CASE(kind, iop, fop) \ diff --git a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp index 6579f4156136..1235934ce60a 100644 --- a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp +++ b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp @@ -3868,7 +3868,7 @@ static ParseResult parseAffineMapWithMinMax(OpAsmParser &parser, return failure(); result.attributes.erase(tmpAttrStrName); llvm::append_range(flatExprs, map.getValue().getResults()); - auto operandsRef = llvm::makeArrayRef(mapOperands); + auto operandsRef = llvm::ArrayRef(mapOperands); auto dimsRef = operandsRef.take_front(map.getValue().getNumDims()); SmallVector dims(dimsRef.begin(), dimsRef.end()); diff --git a/mlir/lib/Dialect/Affine/Utils/Utils.cpp b/mlir/lib/Dialect/Affine/Utils/Utils.cpp index ff249008a5cc..2bb33054c3c8 100644 --- a/mlir/lib/Dialect/Affine/Utils/Utils.cpp +++ b/mlir/lib/Dialect/Affine/Utils/Utils.cpp @@ -362,9 +362,9 @@ mlir::affineParallelize(AffineForOp forOp, parallelReductions, [](const LoopReduction &red) { return red.kind; })); AffineParallelOp newPloop = outsideBuilder.create( loc, ValueRange(reducedValues).getTypes(), reductionKinds, - llvm::makeArrayRef(lowerBoundMap), lowerBoundOperands, - llvm::makeArrayRef(upperBoundMap), upperBoundOperands, - llvm::makeArrayRef(forOp.getStep())); + llvm::ArrayRef(lowerBoundMap), lowerBoundOperands, + llvm::ArrayRef(upperBoundMap), upperBoundOperands, + llvm::ArrayRef(forOp.getStep())); // Steal the body of the old affine for op. newPloop.getRegion().takeBody(forOp.getRegion()); Operation *yieldOp = &newPloop.getBody()->back(); diff --git a/mlir/lib/Dialect/Func/IR/FuncOps.cpp b/mlir/lib/Dialect/Func/IR/FuncOps.cpp index 7bb3663cc43b..7c26e6ae4fe3 100644 --- a/mlir/lib/Dialect/Func/IR/FuncOps.cpp +++ b/mlir/lib/Dialect/Func/IR/FuncOps.cpp @@ -229,7 +229,7 @@ FuncOp FuncOp::create(Location location, StringRef name, FunctionType type, FuncOp FuncOp::create(Location location, StringRef name, FunctionType type, Operation::dialect_attr_range attrs) { SmallVector attrRef(attrs); - return create(location, name, type, llvm::makeArrayRef(attrRef)); + return create(location, name, type, llvm::ArrayRef(attrRef)); } FuncOp FuncOp::create(Location location, StringRef name, FunctionType type, ArrayRef attrs, diff --git a/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp b/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp index 87bcf33947d7..96ca93f547a3 100644 --- a/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp +++ b/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp @@ -347,7 +347,7 @@ private: return SmallVector{ accumFactory(value, shuffleOp.getResult(0))}; }, - [&] { return llvm::makeArrayRef(value); }); + [&] { return llvm::ArrayRef(value); }); value = rewriter.getInsertionBlock()->getArgument(0); } return SmallVector{value}; diff --git a/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp b/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp index 52dc8ffbddf5..49b77009caa4 100644 --- a/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp +++ b/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp @@ -70,14 +70,14 @@ static void insertCopyLoops(ImplicitLocOpBuilder &b, Value from, Value to) { b, b.getLoc(), lbs, ubs, steps, [&](OpBuilder &b, Location loc, ValueRange loopIvs) { ivs.assign(loopIvs.begin(), loopIvs.end()); - auto activeIvs = llvm::makeArrayRef(ivs).take_back(rank); + auto activeIvs = llvm::ArrayRef(ivs).take_back(rank); Value loaded = b.create(loc, from, activeIvs); b.create(loc, loaded, to, activeIvs); }); // Map the innermost loops to threads in reverse order. for (const auto &en : - llvm::enumerate(llvm::reverse(llvm::makeArrayRef(ivs).take_back( + llvm::enumerate(llvm::reverse(llvm::ArrayRef(ivs).take_back( GPUDialect::getNumWorkgroupDimensions())))) { Value v = en.value(); auto loop = cast(v.getParentRegion()->getParentOp()); diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp index cc6213a9817e..e00c6887844e 100644 --- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp +++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp @@ -1033,7 +1033,7 @@ ParseResult InvokeOp::parse(OpAsmParser &parser, OperationState &result) { auto llvmFuncType = LLVM::LLVMFunctionType::get(llvmResultType, argTypes); auto wrappedFuncType = LLVM::LLVMPointerType::get(llvmFuncType); - auto funcArguments = llvm::makeArrayRef(operands).drop_front(); + auto funcArguments = llvm::ArrayRef(operands).drop_front(); // Make sure that the first operand (indirect callee) matches the wrapped // LLVM IR function type, and that the types of the other call operands diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp index 33f49c9febd8..308d003f4b9e 100644 --- a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp +++ b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp @@ -1097,7 +1097,7 @@ ParseResult MapOp::parse(OpAsmParser &parser, OperationState &result) { if (payloadOpName.has_value()) { addBodyWithPayloadOp(parser, result, payloadOpName.value(), payloadOpAttrs, - makeArrayRef(result.operands).drop_back()); + ArrayRef(result.operands).drop_back()); } else { SmallVector regionArgs; if (parser.parseArgumentList(regionArgs, OpAsmParser::Delimiter::Paren, @@ -1338,7 +1338,7 @@ ParseResult ReduceOp::parse(OpAsmParser &parser, OperationState &result) { if (payloadOpName.has_value()) { addBodyWithPayloadOp(parser, result, payloadOpName.value(), payloadOpAttrs, - makeArrayRef(result.operands), /*initFirst=*/true); + ArrayRef(result.operands), /*initFirst=*/true); } else { SmallVector regionArgs; if (parser.parseArgumentList(regionArgs, OpAsmParser::Delimiter::Paren, diff --git a/mlir/lib/Dialect/Linalg/Utils/Utils.cpp b/mlir/lib/Dialect/Linalg/Utils/Utils.cpp index eb1c63836b59..1f622a4037a6 100644 --- a/mlir/lib/Dialect/Linalg/Utils/Utils.cpp +++ b/mlir/lib/Dialect/Linalg/Utils/Utils.cpp @@ -457,7 +457,7 @@ GenericOp makeMemRefCopyOp(OpBuilder &b, Location loc, Value from, Value to) { loc, /*inputs=*/from, /*outputs=*/to, - /*indexingMaps=*/llvm::makeArrayRef({id, id}), + /*indexingMaps=*/llvm::ArrayRef({id, id}), /*iteratorTypes=*/iteratorTypes, [](OpBuilder &b, Location loc, ValueRange args) { b.create(loc, args.front()); diff --git a/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp b/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp index 1f004b1723a7..c0f30283ca8e 100644 --- a/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp +++ b/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp @@ -97,7 +97,7 @@ handleMultidimensionalVectors(ImplicitLocOpBuilder &builder, // If input shape matches target vector width, we can just call the // user-provided compute function with the operands. - if (inputShape == llvm::makeArrayRef(vectorWidth)) + if (inputShape == llvm::ArrayRef(vectorWidth)) return compute(operands); // Check if the inner dimension has to be expanded, or we can directly iterate diff --git a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp index 1631996b5474..78a606de706d 100644 --- a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp +++ b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp @@ -2290,7 +2290,7 @@ computeCollapsedLayoutMap(MemRefType srcType, SmallVector resultStrides; resultStrides.reserve(reassociation.size()); for (const ReassociationIndices &reassoc : reassociation) { - ArrayRef ref = llvm::makeArrayRef(reassoc); + ArrayRef ref = llvm::ArrayRef(reassoc); while (srcShape[ref.back()] == 1 && ref.size() > 1) ref = ref.drop_back(); if (!ShapedType::isDynamic(srcShape[ref.back()]) || ref.size() == 1) { diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp index 36c1c6d0c61b..09a907e25211 100644 --- a/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp +++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp @@ -1129,7 +1129,7 @@ ParseResult spirv::AccessChainOp::parse(OpAsmParser &parser, return failure(); auto resultType = getElementPtrType( - type, llvm::makeArrayRef(result.operands).drop_front(), result.location); + type, llvm::ArrayRef(result.operands).drop_front(), result.location); if (!resultType) { return failure(); } @@ -4677,7 +4677,7 @@ static ParseResult parsePtrAccessChainOpImpl(StringRef opName, return failure(); auto resultType = getElementPtrType( - type, llvm::makeArrayRef(state.operands).drop_front(2), state.location); + type, llvm::ArrayRef(state.operands).drop_front(2), state.location); if (!resultType) return failure(); diff --git a/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp b/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp index ba83fdc25f9a..f85f76d10066 100644 --- a/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp +++ b/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp @@ -711,7 +711,7 @@ Value spirv::getPushConstantValue(Operation *op, unsigned elementCount, loc, integerType, builder.getI32IntegerAttr(offset)); auto addrOp = builder.create(loc, varOp); auto acOp = builder.create( - loc, addrOp, llvm::makeArrayRef({zeroOp, offsetOp})); + loc, addrOp, llvm::ArrayRef({zeroOp, offsetOp})); return builder.create(loc, acOp); } diff --git a/mlir/lib/Dialect/Shape/IR/Shape.cpp b/mlir/lib/Dialect/Shape/IR/Shape.cpp index c3fd22998321..c34d50964ee1 100644 --- a/mlir/lib/Dialect/Shape/IR/Shape.cpp +++ b/mlir/lib/Dialect/Shape/IR/Shape.cpp @@ -1277,7 +1277,7 @@ FuncOp FuncOp::create(Location location, StringRef name, FunctionType type, FuncOp FuncOp::create(Location location, StringRef name, FunctionType type, Operation::dialect_attr_range attrs) { SmallVector attrRef(attrs); - return create(location, name, type, llvm::makeArrayRef(attrRef)); + return create(location, name, type, llvm::ArrayRef(attrRef)); } FuncOp FuncOp::create(Location location, StringRef name, FunctionType type, ArrayRef attrs, @@ -1853,7 +1853,7 @@ LogicalResult SplitAtOp::fold(ArrayRef operands, return failure(); auto shapeVec = llvm::to_vector<6>( operands[0].cast().getValues()); - auto shape = llvm::makeArrayRef(shapeVec); + auto shape = llvm::ArrayRef(shapeVec); auto splitPoint = operands[1].cast().getInt(); // Verify that the split point is in the correct range. // TODO: Constant fold to an "error". @@ -1975,7 +1975,7 @@ ParseResult ReduceOp::parse(OpAsmParser &parser, OperationState &result) { return failure(); // Resolve operands. - auto initVals = llvm::makeArrayRef(operands).drop_front(); + auto initVals = llvm::ArrayRef(operands).drop_front(); if (parser.resolveOperand(operands.front(), shapeOrExtentTensorType, result.operands) || parser.resolveOperands(initVals, result.types, parser.getNameLoc(), diff --git a/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp b/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp index 21473fa1fb90..662ba6c09987 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp +++ b/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp @@ -69,7 +69,7 @@ struct SplitPadding final : public OpRewritePattern { cstZero)); } Value ifCond = eqZeroCmpVals.front(); - for (Value cmp : llvm::makeArrayRef(eqZeroCmpVals).drop_front()) + for (Value cmp : llvm::ArrayRef(eqZeroCmpVals).drop_front()) ifCond = rewriter.create(loc, ifCond, cmp); // Build the scf.if op itself. For the "then" branch, we can elide the diff --git a/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp b/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp index e8ea213142d5..e2e8aa2cea02 100644 --- a/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp +++ b/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp @@ -383,7 +383,7 @@ void transform::TransformResults::set(OpResult value, assert(segments[position].data() == nullptr && "results already set"); int64_t start = operations.size(); llvm::append_range(operations, ops); - segments[position] = makeArrayRef(operations).drop_front(start); + segments[position] = ArrayRef(operations).drop_front(start); } void transform::TransformResults::setParams( diff --git a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp index b1142e878027..3885d57de30b 100644 --- a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp +++ b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp @@ -1204,8 +1204,7 @@ private: /// Folding is only possible in the absence of an internal permutation in the /// result vector. bool canFold() { - return (sentinels == - makeArrayRef(extractPosition).drop_front(extractedRank)); + return (sentinels == ArrayRef(extractPosition).drop_front(extractedRank)); } // Helper to get the next defining op of interest. @@ -1281,7 +1280,7 @@ LogicalResult ExtractFromInsertTransposeChainState::handleTransposeOp() { auto permutation = extractVector(nextTransposeOp.getTransp()); AffineMap m = inversePermutation( AffineMap::getPermutationMap(permutation, extractOp.getContext())); - extractPosition = applyPermutationMap(m, makeArrayRef(extractPosition)); + extractPosition = applyPermutationMap(m, ArrayRef(extractPosition)); return success(); } @@ -1290,8 +1289,8 @@ LogicalResult ExtractFromInsertTransposeChainState::handleInsertOpWithMatchingPos( Value &res) { auto insertedPos = extractVector(nextInsertOp.getPosition()); - if (makeArrayRef(insertedPos) != - llvm::makeArrayRef(extractPosition).take_front(extractedRank)) + if (ArrayRef(insertedPos) != + llvm::ArrayRef(extractPosition).take_front(extractedRank)) return failure(); // Case 2.a. early-exit fold. res = nextInsertOp.getSource(); @@ -1332,8 +1331,7 @@ Value ExtractFromInsertTransposeChainState::tryToFoldExtractOpInPlace( OpBuilder b(extractOp.getContext()); extractOp->setAttr( extractOp.getPositionAttrName(), - b.getI64ArrayAttr( - makeArrayRef(extractPosition).take_front(extractedRank))); + b.getI64ArrayAttr(ArrayRef(extractPosition).take_front(extractedRank))); extractOp.getVectorMutable().assign(source); return extractOp.getResult(); } diff --git a/mlir/lib/ExecutionEngine/RocmRuntimeWrappers.cpp b/mlir/lib/ExecutionEngine/RocmRuntimeWrappers.cpp index 0d85531373d4..43a7e3c62089 100644 --- a/mlir/lib/ExecutionEngine/RocmRuntimeWrappers.cpp +++ b/mlir/lib/ExecutionEngine/RocmRuntimeWrappers.cpp @@ -146,7 +146,7 @@ mgpuMemHostRegisterMemRef(int64_t rank, StridedMemRefType *descriptor, std::rotate(denseStrides.begin(), denseStrides.begin() + 1, denseStrides.end()); denseStrides.back() = 1; - assert(strides == llvm::makeArrayRef(denseStrides)); + assert(strides == llvm::ArrayRef(denseStrides)); auto ptr = descriptor->data + descriptor->offset * elementSizeBytes; mgpuMemHostRegister(ptr, sizeBytes); diff --git a/mlir/lib/Interfaces/DataLayoutInterfaces.cpp b/mlir/lib/Interfaces/DataLayoutInterfaces.cpp index 7482322a39ab..141ec9e44166 100644 --- a/mlir/lib/Interfaces/DataLayoutInterfaces.cpp +++ b/mlir/lib/Interfaces/DataLayoutInterfaces.cpp @@ -305,7 +305,7 @@ static DataLayoutSpecInterface getCombinedDataLayout(Operation *leaf) { if (nonNullSpecs.empty()) return {}; return nonNullSpecs.back().combineWith( - llvm::makeArrayRef(nonNullSpecs).drop_back()); + llvm::ArrayRef(nonNullSpecs).drop_back()); } LogicalResult mlir::detail::verifyDataLayoutOp(Operation *op) { diff --git a/mlir/lib/TableGen/Format.cpp b/mlir/lib/TableGen/Format.cpp index aa3e14bea446..25952157d9b2 100644 --- a/mlir/lib/TableGen/Format.cpp +++ b/mlir/lib/TableGen/Format.cpp @@ -185,7 +185,7 @@ void FmtObjectBase::format(raw_ostream &s) const { s << repl.spec << kMarkerForNoSubst; continue; } - auto range = llvm::makeArrayRef(adapters); + auto range = llvm::ArrayRef(adapters); range = range.drop_front(repl.index); if (repl.end != FmtReplacement::kUnset) range = range.drop_back(adapters.size() - repl.end); diff --git a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp index 1a6e0ba6bc9f..f608637b6e73 100644 --- a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp +++ b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp @@ -856,7 +856,7 @@ spirv::Deserializer::processFunctionType(ArrayRef operands) { } ArrayRef returnTypes; if (!isVoidType(returnType)) { - returnTypes = llvm::makeArrayRef(returnType); + returnTypes = llvm::ArrayRef(returnType); } typeMap[operands[0]] = FunctionType::get(context, argTypes, returnTypes); return success(); diff --git a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp index 484e4307fba9..ff34f02d07b7 100644 --- a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp +++ b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp @@ -49,8 +49,8 @@ deserializeModule(const llvm::MemoryBuffer *input, MLIRContext *context) { return {}; } - auto binary = llvm::makeArrayRef(reinterpret_cast(start), - size / sizeof(uint32_t)); + auto binary = llvm::ArrayRef(reinterpret_cast(start), + size / sizeof(uint32_t)); return spirv::deserialize(binary, context); } diff --git a/mlir/lib/Tools/PDLL/AST/NodePrinter.cpp b/mlir/lib/Tools/PDLL/AST/NodePrinter.cpp index ea606b4f256a..43b602204b01 100644 --- a/mlir/lib/Tools/PDLL/AST/NodePrinter.cpp +++ b/mlir/lib/Tools/PDLL/AST/NodePrinter.cpp @@ -107,7 +107,7 @@ private: if (elementIndentStack.empty()) return; - for (bool isLastElt : llvm::makeArrayRef(elementIndentStack).drop_back()) + for (bool isLastElt : llvm::ArrayRef(elementIndentStack).drop_back()) os << (isLastElt ? " " : " |"); os << (elementIndentStack.back() ? " `" : " |"); } diff --git a/mlir/lib/Tools/PDLL/AST/TypeDetail.h b/mlir/lib/Tools/PDLL/AST/TypeDetail.h index 4e2a686d704f..a0bd84eacc4a 100644 --- a/mlir/lib/Tools/PDLL/AST/TypeDetail.h +++ b/mlir/lib/Tools/PDLL/AST/TypeDetail.h @@ -115,9 +115,9 @@ struct TupleTypeStorage std::pair, ArrayRef> key) { SmallVector names = llvm::to_vector(llvm::map_range( key.second, [&](StringRef name) { return alloc.copyInto(name); })); - return new (alloc.allocate()) TupleTypeStorage( - std::make_pair(alloc.copyInto(key.first), - alloc.copyInto(llvm::makeArrayRef(names)))); + return new (alloc.allocate()) + TupleTypeStorage(std::make_pair(alloc.copyInto(key.first), + alloc.copyInto(llvm::ArrayRef(names)))); } }; diff --git a/mlir/lib/Transforms/Utils/DialectConversion.cpp b/mlir/lib/Transforms/Utils/DialectConversion.cpp index c476e5f0c569..024c2f5e16e3 100644 --- a/mlir/lib/Transforms/Utils/DialectConversion.cpp +++ b/mlir/lib/Transforms/Utils/DialectConversion.cpp @@ -3364,7 +3364,7 @@ LogicalResult mlir::applyPartialConversion(Operation *op, ConversionTarget &target, const FrozenRewritePatternSet &patterns, DenseSet *unconvertedOps) { - return applyPartialConversion(llvm::makeArrayRef(op), target, patterns, + return applyPartialConversion(llvm::ArrayRef(op), target, patterns, unconvertedOps); } @@ -3380,7 +3380,7 @@ mlir::applyFullConversion(ArrayRef ops, ConversionTarget &target, LogicalResult mlir::applyFullConversion(Operation *op, ConversionTarget &target, const FrozenRewritePatternSet &patterns) { - return applyFullConversion(llvm::makeArrayRef(op), target, patterns); + return applyFullConversion(llvm::ArrayRef(op), target, patterns); } //===----------------------------------------------------------------------===// @@ -3401,6 +3401,6 @@ mlir::applyAnalysisConversion(Operation *op, ConversionTarget &target, const FrozenRewritePatternSet &patterns, DenseSet &convertedOps, function_ref notifyCallback) { - return applyAnalysisConversion(llvm::makeArrayRef(op), target, patterns, + return applyAnalysisConversion(llvm::ArrayRef(op), target, patterns, convertedOps, notifyCallback); } diff --git a/mlir/test/lib/Dialect/Test/TestDialect.cpp b/mlir/test/lib/Dialect/Test/TestDialect.cpp index 49b189f5802e..e710f03bc251 100644 --- a/mlir/test/lib/Dialect/Test/TestDialect.cpp +++ b/mlir/test/lib/Dialect/Test/TestDialect.cpp @@ -945,8 +945,8 @@ ParseResult PrettyPrintedRegionOp::parse(OpAsmParser &parser, // test.pretty_printed_region start end : // Else fallback to parsing the "non pretty-printed" version. if (!succeeded(parser.parseOptionalKeyword("start"))) - return parser.parseGenericOperationAfterOpName( - result, llvm::makeArrayRef(operands)); + return parser.parseGenericOperationAfterOpName(result, + llvm::ArrayRef(operands)); FailureOr parseOpNameInfo = parser.parseCustomOperationName(); if (failed(parseOpNameInfo)) diff --git a/mlir/test/lib/Dialect/Test/TestPatterns.cpp b/mlir/test/lib/Dialect/Test/TestPatterns.cpp index f16636cbff16..9b74e808506f 100644 --- a/mlir/test/lib/Dialect/Test/TestPatterns.cpp +++ b/mlir/test/lib/Dialect/Test/TestPatterns.cpp @@ -233,7 +233,7 @@ public: // Check if these transformations introduce visiting of operations that // are not in the `ops` set (The new created ops are valid). An invalid // operation will trigger the assertion while processing. - (void)applyOpPatternsAndFold(makeArrayRef(ops), std::move(patterns), + (void)applyOpPatternsAndFold(ArrayRef(ops), std::move(patterns), /*strict=*/true); } @@ -354,7 +354,7 @@ struct TestReturnTypeDriver for (auto &op : getOperation().getBody().front()) ops.push_back(&op); // Generate test patterns for each, but skip terminator. - for (auto *op : llvm::makeArrayRef(ops).drop_back()) { + for (auto *op : llvm::ArrayRef(ops).drop_back()) { // Test create method of each of the Op classes below. The resultant // output would be in reverse order underneath `op` from which // the attributes and regions are used. diff --git a/mlir/test/mlir-tblgen/op-attribute.td b/mlir/test/mlir-tblgen/op-attribute.td index 012d03c3dae6..3dc426cbf5d7 100644 --- a/mlir/test/mlir-tblgen/op-attribute.td +++ b/mlir/test/mlir-tblgen/op-attribute.td @@ -44,7 +44,7 @@ def AOp : NS_Op<"a_op", []> { // DECL: static ::llvm::ArrayRef<::llvm::StringRef> getAttributeNames() // DECL-NEXT: static ::llvm::StringRef attrNames[] = // DECL-SAME: {::llvm::StringRef("aAttr"), ::llvm::StringRef("bAttr"), ::llvm::StringRef("cAttr"), ::llvm::StringRef("dAttr")}; -// DECL-NEXT: return ::llvm::makeArrayRef(attrNames); +// DECL-NEXT: return ::llvm::ArrayRef(attrNames); // DECL: ::mlir::StringAttr getAAttrAttrName() // DECL-NEXT: return getAttributeNameForIndex(0); @@ -193,7 +193,7 @@ def AgetOp : Op { // DECL: static ::llvm::ArrayRef<::llvm::StringRef> getAttributeNames() // DECL-NEXT: static ::llvm::StringRef attrNames[] = // DECL-SAME: {::llvm::StringRef("aAttr"), ::llvm::StringRef("bAttr"), ::llvm::StringRef("cAttr")}; -// DECL-NEXT: return ::llvm::makeArrayRef(attrNames); +// DECL-NEXT: return ::llvm::ArrayRef(attrNames); // DECL: ::mlir::StringAttr getAAttrAttrName() // DECL-NEXT: return getAttributeNameForIndex(0); diff --git a/mlir/tools/mlir-tblgen/AttrOrTypeFormatGen.cpp b/mlir/tools/mlir-tblgen/AttrOrTypeFormatGen.cpp index 0afdbfa63139..5a4617ba884d 100644 --- a/mlir/tools/mlir-tblgen/AttrOrTypeFormatGen.cpp +++ b/mlir/tools/mlir-tblgen/AttrOrTypeFormatGen.cpp @@ -658,7 +658,7 @@ void DefFormat::genOptionalGroupParser(OptionalElement *el, FmtContext &ctx, os << ") {\n"; } else if (auto *param = dyn_cast(first)) { genVariableParser(param, ctx, os); - guardOn(llvm::makeArrayRef(param)); + guardOn(llvm::ArrayRef(param)); } else if (auto *params = dyn_cast(first)) { genParamsParser(params, ctx, os); guardOn(params->getParams()); @@ -852,7 +852,7 @@ void DefFormat::genOptionalGroupPrinter(OptionalElement *el, FmtContext &ctx, MethodBody &os) { FormatElement *anchor = el->getAnchor(); if (auto *param = dyn_cast(anchor)) { - guardOnAny(ctx, os, llvm::makeArrayRef(param), el->isInverted()); + guardOnAny(ctx, os, llvm::ArrayRef(param), el->isInverted()); } else if (auto *params = dyn_cast(anchor)) { guardOnAny(ctx, os, params->getParams(), el->isInverted()); } else if (auto *strct = dyn_cast(anchor)) { diff --git a/mlir/tools/mlir-tblgen/FormatGen.h b/mlir/tools/mlir-tblgen/FormatGen.h index 60264adcebc9..e5fd04a24b2f 100644 --- a/mlir/tools/mlir-tblgen/FormatGen.h +++ b/mlir/tools/mlir-tblgen/FormatGen.h @@ -387,14 +387,14 @@ public: /// Return the `then` elements of the optional group. Drops the first /// `thenParseStart` whitespace elements if `parseable` is true. ArrayRef getThenElements(bool parseable = false) const { - return llvm::makeArrayRef(thenElements) + return llvm::ArrayRef(thenElements) .drop_front(parseable ? thenParseStart : 0); } /// Return the `else` elements of the optional group. Drops the first /// `elseParseStart` whitespace elements if `parseable` is true. ArrayRef getElseElements(bool parseable = false) const { - return llvm::makeArrayRef(elseElements) + return llvm::ArrayRef(elseElements) .drop_front(parseable ? elseParseStart : 0); } diff --git a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp index 204d1d730ba5..683f812ac64b 100644 --- a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp +++ b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp @@ -902,7 +902,7 @@ void OpEmitter::genAttrNameGetters() { [&](StringRef attrName) { body << "::llvm::StringRef(\"" << attrName << "\")"; }); - body << "};\n return ::llvm::makeArrayRef(attrNames);"; + body << "};\n return ::llvm::ArrayRef(attrNames);"; } // Emit the getAttributeNameForIndex methods. diff --git a/mlir/tools/mlir-tblgen/OpPythonBindingGen.cpp b/mlir/tools/mlir-tblgen/OpPythonBindingGen.cpp index 1bd98eeb019c..330268dc8183 100644 --- a/mlir/tools/mlir-tblgen/OpPythonBindingGen.cpp +++ b/mlir/tools/mlir-tblgen/OpPythonBindingGen.cpp @@ -893,11 +893,9 @@ static void emitDefaultOpBuilder(const Operator &op, raw_ostream &os) { populateBuilderLinesOperand(op, operandArgNames, builderLines); populateBuilderLinesAttr( - op, llvm::makeArrayRef(builderArgs).drop_front(numResultArgs), - builderLines); + op, llvm::ArrayRef(builderArgs).drop_front(numResultArgs), builderLines); populateBuilderLinesResult( - op, llvm::makeArrayRef(builderArgs).take_front(numResultArgs), - builderLines); + op, llvm::ArrayRef(builderArgs).take_front(numResultArgs), builderLines); populateBuilderLinesSuccessors(op, successorArgNames, builderLines); populateBuilderRegions(op, builderArgs, builderLines); diff --git a/mlir/unittests/IR/AttributeTest.cpp b/mlir/unittests/IR/AttributeTest.cpp index e3c8cf45f2f2..a1813e6b1996 100644 --- a/mlir/unittests/IR/AttributeTest.cpp +++ b/mlir/unittests/IR/AttributeTest.cpp @@ -28,7 +28,7 @@ static void testSplat(Type eltType, const EltTy &splatElt) { EXPECT_TRUE(splat.isSplat()); auto detectedSplat = - DenseElementsAttr::get(shape, llvm::makeArrayRef({splatElt, splatElt})); + DenseElementsAttr::get(shape, llvm::ArrayRef({splatElt, splatElt})); EXPECT_EQ(detectedSplat, splat); for (auto newValue : detectedSplat.template getValues()) @@ -220,7 +220,7 @@ TEST(DenseScalarTest, ExtractZeroRankElement) { Attribute value = IntegerAttr::get(intTy, elementValue); RankedTensorType shape = RankedTensorType::get({}, intTy); - auto attr = DenseElementsAttr::get(shape, llvm::makeArrayRef({elementValue})); + auto attr = DenseElementsAttr::get(shape, llvm::ArrayRef({elementValue})); EXPECT_TRUE(attr.getValues()[0] == value); } @@ -232,7 +232,7 @@ TEST(DenseSplatMapValuesTest, I32ToTrue) { RankedTensorType shape = RankedTensorType::get({4}, intTy); auto attr = - DenseElementsAttr::get(shape, llvm::makeArrayRef({elementValue})) + DenseElementsAttr::get(shape, llvm::ArrayRef({elementValue})) .mapValues(boolTy, [](const APInt &x) { return x.isZero() ? APInt::getZero(1) : APInt::getAllOnes(1); }); @@ -249,7 +249,7 @@ TEST(DenseSplatMapValuesTest, I32ToFalse) { RankedTensorType shape = RankedTensorType::get({4}, intTy); auto attr = - DenseElementsAttr::get(shape, llvm::makeArrayRef({elementValue})) + DenseElementsAttr::get(shape, llvm::ArrayRef({elementValue})) .mapValues(boolTy, [](const APInt &x) { return x.isZero() ? APInt::getZero(1) : APInt::getAllOnes(1); }); @@ -282,7 +282,7 @@ static void checkNativeAccess(MLIRContext *ctx, ArrayRef data, template static void checkNativeIntAccess(Builder &builder, size_t intWidth) { T data[] = {0, 1, 2}; - checkNativeAccess(builder.getContext(), llvm::makeArrayRef(data), + checkNativeAccess(builder.getContext(), llvm::ArrayRef(data), builder.getIntegerType(intWidth)); } @@ -294,7 +294,7 @@ TEST(DenseResourceElementsAttrTest, CheckNativeAccess) { // Bool bool boolData[] = {true, false, true}; checkNativeAccess( - &context, llvm::makeArrayRef(boolData), builder.getI1Type()); + &context, llvm::ArrayRef(boolData), builder.getI1Type()); // Unsigned integers checkNativeIntAccess(builder, 8); @@ -311,12 +311,12 @@ TEST(DenseResourceElementsAttrTest, CheckNativeAccess) { // Float float floatData[] = {0, 1, 2}; checkNativeAccess( - &context, llvm::makeArrayRef(floatData), builder.getF32Type()); + &context, llvm::ArrayRef(floatData), builder.getF32Type()); // Double double doubleData[] = {0, 1, 2}; checkNativeAccess( - &context, llvm::makeArrayRef(doubleData), builder.getF64Type()); + &context, llvm::ArrayRef(doubleData), builder.getF64Type()); } TEST(DenseResourceElementsAttrTest, CheckNoCast) { diff --git a/mlir/unittests/IR/SubElementInterfaceTest.cpp b/mlir/unittests/IR/SubElementInterfaceTest.cpp index 66e29d48f7f4..ab461f4dc340 100644 --- a/mlir/unittests/IR/SubElementInterfaceTest.cpp +++ b/mlir/unittests/IR/SubElementInterfaceTest.cpp @@ -29,7 +29,7 @@ TEST(SubElementInterfaceTest, Nested) { SmallVector subAttrs; dictAttr.walkSubAttrs([&](Attribute attr) { subAttrs.push_back(attr); }); - EXPECT_EQ(llvm::makeArrayRef(subAttrs), + EXPECT_EQ(llvm::ArrayRef(subAttrs), ArrayRef({strAttr, trueAttr, falseAttr, boolArrayAttr})); }