diff options
author | Alex Langford <alangford@apple.com> | 2024-02-17 12:11:10 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-17 12:11:10 -0800 |
commit | 164055f897c049543bd3e15548f891f823dc18b4 (patch) | |
tree | 633c03ad2d0b1dbf1bc0d855378bb8dd2d7c64c8 | |
parent | 21ddd7ff2b166c5e133b460b1a09ee8adb786ccd (diff) |
Revert "[Support] Introduce formatv variant of createStringError" (#82126)
Reverts llvm/llvm-project#80493
This increased clang compile times by 0.5%. I'll figure out a less
expensive way to achieve this.
-rw-r--r-- | llvm/include/llvm/Support/Error.h | 10 | ||||
-rw-r--r-- | llvm/unittests/Support/ErrorTest.cpp | 17 |
2 files changed, 0 insertions, 27 deletions
diff --git a/llvm/include/llvm/Support/Error.h b/llvm/include/llvm/Support/Error.h index ddc1afb96230..bb4f38f7ec35 100644 --- a/llvm/include/llvm/Support/Error.h +++ b/llvm/include/llvm/Support/Error.h @@ -22,7 +22,6 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorOr.h" #include "llvm/Support/Format.h" -#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/raw_ostream.h" #include <cassert> #include <cstdint> @@ -1262,15 +1261,6 @@ inline Error createStringError(std::errc EC, char const *Fmt, return createStringError(std::make_error_code(EC), Fmt, Vals...); } -template <typename... Ts> -inline Error createStringErrorV(std::error_code EC, const char *Fmt, - const Ts &...Vals) { - std::string Buffer; - raw_string_ostream Stream(Buffer); - Stream << formatv(Fmt, Vals...); - return make_error<StringError>(Stream.str(), EC); -} - /// This class wraps a filename and another Error. /// /// In some cases, an error needs to live along a 'source' name, in order to diff --git a/llvm/unittests/Support/ErrorTest.cpp b/llvm/unittests/Support/ErrorTest.cpp index a700a50e1d43..11f93203597b 100644 --- a/llvm/unittests/Support/ErrorTest.cpp +++ b/llvm/unittests/Support/ErrorTest.cpp @@ -472,23 +472,6 @@ TEST(Error, createStringError) { << "Failed to convert createStringError() result to error_code."; } -TEST(Error, createStringErrorV) { - static llvm::StringRef Bar("bar"); - static const std::error_code EC = errc::invalid_argument; - std::string Msg; - raw_string_ostream S(Msg); - logAllUnhandledErrors(createStringErrorV(EC, "foo{0}{1}{2:x}", Bar, 1, 0xff), - S); - EXPECT_EQ(S.str(), "foobar10xff\n") - << "Unexpected createStringErrorV() log result"; - - S.flush(); - Msg.clear(); - auto Res = errorToErrorCode(createStringErrorV(EC, "foo{0}", Bar)); - EXPECT_EQ(Res, EC) - << "Failed to convert createStringErrorV() result to error_code."; -} - // Test that the ExitOnError utility works as expected. TEST(ErrorDeathTest, ExitOnError) { ExitOnError ExitOnErr; |