Author: Amr Hesham Date: 2025-02-10T13:42:43-08:00 New Revision: ed762db1e0088a0ad5c7d72e8ad2b08a5b1cf1be
URL: https://github.com/llvm/llvm-project/commit/ed762db1e0088a0ad5c7d72e8ad2b08a5b1cf1be DIFF: https://github.com/llvm/llvm-project/commit/ed762db1e0088a0ad5c7d72e8ad2b08a5b1cf1be.diff LOG: [LLVM][Support] Add new CreateFileError functions (#125906) Add new CreateFileError functions to create a StringError with the specified error code and prepend the file path to it Needed for: #125345 (cherry picked from commit 2464f4ba6e0e50bb30c31b6526fa0bdd5a531217) Added: Modified: llvm/include/llvm/Support/Error.h llvm/unittests/Support/ErrorTest.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/Support/Error.h b/llvm/include/llvm/Support/Error.h index 90120156ec2ead1..c1b809a09bb80e1 100644 --- a/llvm/include/llvm/Support/Error.h +++ b/llvm/include/llvm/Support/Error.h @@ -1404,6 +1404,23 @@ inline Error createFileError(const Twine &F, size_t Line, std::error_code EC) { return createFileError(F, Line, errorCodeToError(EC)); } +/// Create a StringError with the specified error code and prepend the file path +/// to it. +inline Error createFileError(const Twine &F, std::error_code EC, + const Twine &S) { + Error E = createStringError(EC, S); + return createFileError(F, std::move(E)); +} + +/// Create a StringError with the specified error code and prepend the file path +/// to it. +template <typename... Ts> +inline Error createFileError(const Twine &F, std::error_code EC, + char const *Fmt, const Ts &...Vals) { + Error E = createStringError(EC, Fmt, Vals...); + return createFileError(F, std::move(E)); +} + Error createFileError(const Twine &F, ErrorSuccess) = delete; /// Helper for check-and-exit error handling. diff --git a/llvm/unittests/Support/ErrorTest.cpp b/llvm/unittests/Support/ErrorTest.cpp index 98d19e8d2a15a3d..00c562ecc059d37 100644 --- a/llvm/unittests/Support/ErrorTest.cpp +++ b/llvm/unittests/Support/ErrorTest.cpp @@ -976,6 +976,17 @@ TEST(Error, FileErrorTest) { handleAllErrors(std::move(FE6), [](std::unique_ptr<FileError> F) { EXPECT_EQ(F->messageWithoutFileInfo(), "CustomError {6}"); }); + + Error FE7 = + createFileError("file.bin", make_error_code(std::errc::invalid_argument), + "invalid argument"); + EXPECT_EQ(toString(std::move(FE7)), "'file.bin': invalid argument"); + + StringRef Argument = "arg"; + Error FE8 = + createFileError("file.bin", make_error_code(std::errc::invalid_argument), + "invalid argument '%s'", Argument.str().c_str()); + EXPECT_EQ(toString(std::move(FE8)), "'file.bin': invalid argument 'arg'"); } TEST(Error, FileErrorErrorCode) { _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
