Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
5fc4aee2d2db5580b138e4e3dab9c8effd66b5fe
allwpilib/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch
Ryan Blue 7ab5800487 [wpiutil] Fix docs typo in SmallVector (#5381)
2023-06-08 19:58:21 -07:00

284 lines
11 KiB
Diff
Raw Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 19:16:51 -0400
Subject: [PATCH 22/29] Remove unused functions
---
llvm/include/llvm/Support/DJB.h | 3 -
llvm/include/llvm/Support/raw_ostream.h | 5 +-
llvm/lib/Support/ErrorHandling.cpp | 16 -----
llvm/lib/Support/raw_ostream.cpp | 49 +++++++--------
llvm/unittests/ADT/SmallStringTest.cpp | 81 -------------------------
5 files changed, 23 insertions(+), 131 deletions(-)
diff --git a/llvm/include/llvm/Support/DJB.h b/llvm/include/llvm/Support/DJB.h
index 8737cd144c37f9041a781a74e9f2b43384e85761..67b0ae91b4b1401374d7d39d859daaf30da17ee2 100644
--- a/llvm/include/llvm/Support/DJB.h
+++ b/llvm/include/llvm/Support/DJB.h
@@ -24,9 +24,6 @@ inline uint32_t djbHash(std::string_view Buffer, uint32_t H = 5381) {
return H;
}
-/// Computes the Bernstein hash after folding the input according to the Dwarf 5
-/// standard case folding rules.
-uint32_t caseFoldingDjbHash(StringRef Buffer, uint32_t H = 5381);
} // namespace llvm
#endif // LLVM_SUPPORT_DJB_H
diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
index 256bcec259a8026473a5f3926bd79b215bd5b888..9b3a87e1bbc0abe83b204bd8f889ffe3a3cafffa 100644
--- a/llvm/include/llvm/Support/raw_ostream.h
+++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -71,7 +71,6 @@ private:
/// for a \see write_impl() call to handle the data which has been put into
/// this buffer.
char *OutBufStart, *OutBufEnd, *OutBufCur;
- bool ColorEnabled = false;
/// Optional stream this stream is tied to. If this stream is written to, the
/// tied-to stream will be flushed first.
@@ -304,9 +303,9 @@ public:
// Enable or disable colors. Once enable_colors(false) is called,
// changeColor() has no effect until enable_colors(true) is called.
- virtual void enable_colors(bool enable) { ColorEnabled = enable; }
+ virtual void enable_colors(bool /*enable*/) {}
- bool colors_enabled() const { return ColorEnabled; }
+ bool colors_enabled() const { return false; }
/// Tie this stream to the specified stream. Replaces any existing tied-to
/// stream. Specifying a nullptr unties the stream.
diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
index 27ca15f7d239a8e5050cadd159dad96de150e444..53fe22b5eb8dad289cced414ed6f544fd0249504 100644
--- a/llvm/lib/Support/ErrorHandling.cpp
+++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -178,22 +178,6 @@ void llvm::llvm_unreachable_internal(const char *msg, const char *file,
#endif
}
-static void bindingsErrorHandler(void *user_data, const char *reason,
- bool gen_crash_diag) {
- LLVMFatalErrorHandler handler =
- LLVM_EXTENSION reinterpret_cast<LLVMFatalErrorHandler>(user_data);
- handler(reason);
-}
-
-void LLVMInstallFatalErrorHandler(LLVMFatalErrorHandler Handler) {
- install_fatal_error_handler(bindingsErrorHandler,
- LLVM_EXTENSION reinterpret_cast<void *>(Handler));
-}
-
-void LLVMResetFatalErrorHandler() {
- remove_fatal_error_handler();
-}
-
#ifdef _WIN32
#include <winerror.h>
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index 878a3a5e99949da360a93dc51298460cc61d4f3f..632b522358c969682f01dbbb9a6f86cf14093bc3 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -167,16 +167,6 @@ raw_ostream &raw_ostream::write_escaped(std::string_view Str,
return *this;
}
-raw_ostream &raw_ostream::operator<<(const void *P) {
- llvm::write_hex(*this, (uintptr_t)P, HexPrintStyle::PrefixLower);
- return *this;
-}
-
-raw_ostream &raw_ostream::operator<<(double N) {
- llvm::write_double(*this, N, FloatStyle::Exponent);
- return *this;
-}
-
void raw_ostream::flush_nonempty() {
assert(OutBufCur > OutBufStart && "Invalid call to flush_nonempty.");
size_t Length = OutBufCur - OutBufStart;
@@ -321,15 +311,22 @@ static int getFD(std::string_view Filename, std::error_code &EC,
if (Filename == "-") {
EC = std::error_code();
// Change stdout's text/binary mode based on the Flags.
- sys::ChangeStdoutMode(Flags);
+ if (!(Flags & fs::OF_Text)) {
+#if defined(_WIN32)
+ _setmode(_fileno(stdout), _O_BINARY);
+#endif
+ }
return STDOUT_FILENO;
}
- int FD;
- if (Access & sys::fs::FA_Read)
- EC = sys::fs::openFileForReadWrite(Filename, FD, Disp, Flags);
+ fs::file_t F;
+ if (Access & fs::FA_Read)
+ F = fs::OpenFileForReadWrite(fs::path{std::string_view{Filename.data(), Filename.size()}}, EC, Disp, Flags);
else
- EC = sys::fs::openFileForWrite(Filename, FD, Disp, Flags);
+ F = fs::OpenFileForWrite(fs::path{std::string_view{Filename.data(), Filename.size()}}, EC, Disp, Flags);
+ if (EC)
+ return -1;
+ int FD = fs::FileToFd(F, EC, Flags);
if (EC)
return -1;
@@ -389,12 +386,8 @@ raw_fd_ostream::raw_fd_ostream(int fd, bool shouldClose, bool unbuffered,
// Get the starting position.
off_t loc = ::lseek(FD, 0, SEEK_CUR);
- sys::fs::file_status Status;
- std::error_code EC = status(FD, Status);
- IsRegularFile = Status.type() == sys::fs::file_type::regular_file;
#ifdef _WIN32
- // MSVCRT's _lseek(SEEK_CUR) doesn't return -1 for pipes.
- SupportsSeeking = !EC && IsRegularFile;
+ SupportsSeeking = loc != (off_t)-1 && ::GetFileType(reinterpret_cast<HANDLE>(::_get_osfhandle(FD))) != FILE_TYPE_PIPE;
#else
SupportsSeeking = !EC && loc != (off_t)-1;
#endif
@@ -407,10 +400,8 @@ raw_fd_ostream::raw_fd_ostream(int fd, bool shouldClose, bool unbuffered,
raw_fd_ostream::~raw_fd_ostream() {
if (FD >= 0) {
flush();
- if (ShouldClose) {
- if (auto EC = sys::Process::SafelyCloseFileDescriptor(FD))
- error_detected(EC);
- }
+ if (ShouldClose && ::close(FD) < 0)
+ error_detected(std::error_code(errno, std::generic_category()));
}
#ifdef __MINGW32__
@@ -505,7 +496,11 @@ void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {
do {
size_t ChunkSize = std::min(Size, MaxWriteSize);
+#ifdef _WIN32
+ int ret = ::_write(FD, Ptr, ChunkSize);
+#else
ssize_t ret = ::write(FD, Ptr, ChunkSize);
+#endif
if (ret < 0) {
// If it's a recoverable error, swallow it and retry the write.
@@ -540,8 +535,8 @@ void raw_fd_ostream::close() {
assert(ShouldClose);
ShouldClose = false;
flush();
- if (auto EC = sys::Process::SafelyCloseFileDescriptor(FD))
- error_detected(EC);
+ if (::close(FD) < 0)
+ error_detected(std::error_code(errno, std::generic_category()));
FD = -1;
}
@@ -550,8 +545,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) {
flush();
#ifdef _WIN32
pos = ::_lseeki64(FD, off, SEEK_SET);
-#elif defined(HAVE_LSEEK64)
- pos = ::lseek64(FD, off, SEEK_SET);
#else
pos = ::lseek(FD, off, SEEK_SET);
#endif
diff --git a/llvm/unittests/ADT/SmallStringTest.cpp b/llvm/unittests/ADT/SmallStringTest.cpp
index bee3875d11c9b793d79ac442312559b11dba9f5f..87600ea4704bc98acab9085d16cfafd3d586714e 100644
--- a/llvm/unittests/ADT/SmallStringTest.cpp
+++ b/llvm/unittests/ADT/SmallStringTest.cpp
@@ -129,23 +129,6 @@ TEST_F(SmallStringTest, StdStringConversion) {
EXPECT_EQ("abc", theStdString);
}
-TEST_F(SmallStringTest, Substr) {
- theString = "hello";
- EXPECT_EQ("lo", theString.substr(3));
- EXPECT_EQ("", theString.substr(100));
- EXPECT_EQ("hello", theString.substr(0, 100));
- EXPECT_EQ("o", theString.substr(4, 10));
-}
-
-TEST_F(SmallStringTest, Slice) {
- theString = "hello";
- EXPECT_EQ("l", theString.slice(2, 3));
- EXPECT_EQ("ell", theString.slice(1, 4));
- EXPECT_EQ("llo", theString.slice(2, 100));
- EXPECT_EQ("", theString.slice(2, 1));
- EXPECT_EQ("", theString.slice(10, 20));
-}
-
TEST_F(SmallStringTest, Find) {
theString = "hello";
EXPECT_EQ(2U, theString.find('l'));
@@ -180,68 +163,4 @@ TEST_F(SmallStringTest, Find) {
EXPECT_EQ(0U, theString.find(""));
}
-TEST_F(SmallStringTest, Count) {
- theString = "hello";
- EXPECT_EQ(2U, theString.count('l'));
- EXPECT_EQ(1U, theString.count('o'));
- EXPECT_EQ(0U, theString.count('z'));
- EXPECT_EQ(0U, theString.count("helloworld"));
- EXPECT_EQ(1U, theString.count("hello"));
- EXPECT_EQ(1U, theString.count("ello"));
- EXPECT_EQ(0U, theString.count("zz"));
-}
-
-TEST_F(SmallStringTest, Realloc) {
- theString = "abcd";
- theString.reserve(100);
- EXPECT_EQ("abcd", theString);
- unsigned const N = 100000;
- theString.reserve(N);
- for (unsigned i = 0; i < N - 4; ++i)
- theString.push_back('y');
- EXPECT_EQ("abcdyyy", theString.slice(0, 7));
-}
-
-TEST_F(SmallStringTest, Comparisons) {
- EXPECT_EQ(-1, SmallString<10>("aab").compare("aad"));
- EXPECT_EQ( 0, SmallString<10>("aab").compare("aab"));
- EXPECT_EQ( 1, SmallString<10>("aab").compare("aaa"));
- EXPECT_EQ(-1, SmallString<10>("aab").compare("aabb"));
- EXPECT_EQ( 1, SmallString<10>("aab").compare("aa"));
- EXPECT_EQ( 1, SmallString<10>("\xFF").compare("\1"));
-
- EXPECT_EQ(-1, SmallString<10>("AaB").compare_insensitive("aAd"));
- EXPECT_EQ( 0, SmallString<10>("AaB").compare_insensitive("aab"));
- EXPECT_EQ( 1, SmallString<10>("AaB").compare_insensitive("AAA"));
- EXPECT_EQ(-1, SmallString<10>("AaB").compare_insensitive("aaBb"));
- EXPECT_EQ( 1, SmallString<10>("AaB").compare_insensitive("aA"));
- EXPECT_EQ( 1, SmallString<10>("\xFF").compare_insensitive("\1"));
-
- EXPECT_EQ(-1, SmallString<10>("aab").compare_numeric("aad"));
- EXPECT_EQ( 0, SmallString<10>("aab").compare_numeric("aab"));
- EXPECT_EQ( 1, SmallString<10>("aab").compare_numeric("aaa"));
- EXPECT_EQ(-1, SmallString<10>("aab").compare_numeric("aabb"));
- EXPECT_EQ( 1, SmallString<10>("aab").compare_numeric("aa"));
- EXPECT_EQ(-1, SmallString<10>("1").compare_numeric("10"));
- EXPECT_EQ( 0, SmallString<10>("10").compare_numeric("10"));
- EXPECT_EQ( 0, SmallString<10>("10a").compare_numeric("10a"));
- EXPECT_EQ( 1, SmallString<10>("2").compare_numeric("1"));
- EXPECT_EQ( 0, SmallString<10>("llvm_v1i64_ty").compare_numeric("llvm_v1i64_ty"));
- EXPECT_EQ( 1, SmallString<10>("\xFF").compare_numeric("\1"));
- EXPECT_EQ( 1, SmallString<10>("V16").compare_numeric("V1_q0"));
- EXPECT_EQ(-1, SmallString<10>("V1_q0").compare_numeric("V16"));
- EXPECT_EQ(-1, SmallString<10>("V8_q0").compare_numeric("V16"));
- EXPECT_EQ( 1, SmallString<10>("V16").compare_numeric("V8_q0"));
- EXPECT_EQ(-1, SmallString<10>("V1_q0").compare_numeric("V8_q0"));
- EXPECT_EQ( 1, SmallString<10>("V8_q0").compare_numeric("V1_q0"));
-}
-
-// Check gtest prints SmallString as a string instead of a container of chars.
-// The code is in utils/unittest/googletest/internal/custom/gtest-printers.h
-TEST_F(SmallStringTest, GTestPrinter) {
- EXPECT_EQ(R"("foo")", ::testing::PrintToString(SmallString<1>("foo")));
- const SmallVectorImpl<char> &ErasedSmallString = SmallString<1>("foo");
- EXPECT_EQ(R"("foo")", ::testing::PrintToString(ErasedSmallString));
-}
-
} // namespace
Reference in New Issue View Git Blame Copy Permalink