Revert "[compiler-rt][rtsan] intercept setbuf, setvbuf, setlinebuf an… #121639
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d setbuffer (llvm#121616)" This reverts commit 95db111.
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: David CARLIER (devnexen) Changes…d setbuffer (#121616)" This reverts commit 95db111. Full diff: https://github.com/llvm/llvm-project/pull/121639.diff 2 Files Affected:
diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
index 227d077290af71..9f89ab6bf1fc7d 100644
--- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
@@ -325,37 +325,6 @@ INTERCEPTOR(FILE *, fmemopen, void *buf, size_t size, const char *mode) {
#define RTSAN_MAYBE_INTERCEPT_FMEMOPEN
#endif
-#if SANITIZER_INTERCEPT_SETVBUF
-INTERCEPTOR(void, setbuf, FILE *stream, char *buf) {
- __rtsan_notify_intercepted_call("setbuf");
- return REAL(setbuf)(stream, buf);
-}
-
-INTERCEPTOR(void, setbuffer, FILE *stream, char *buf, size_t size) {
- __rtsan_notify_intercepted_call("setbuffer");
- return REAL(setbuffer)(stream, buf, size);
-}
-
-INTERCEPTOR(void, setlinebuf, FILE *stream) {
- __rtsan_notify_intercepted_call("setlinebuf");
- return REAL(setlinebuf)(stream);
-}
-
-INTERCEPTOR(int, setvbuf, FILE *stream, char *buf, int mode, size_t size) {
- __rtsan_notify_intercepted_call("setvbuf");
- return REAL(setvbuf)(stream, buf, mode, size);
-}
-#define RTSAN_MAYBE_INTERCEPT_SETBUF INTERCEPT_FUNCTION(setbuf)
-#define RTSAN_MAYBE_INTERCEPT_SETBUFFER INTERCEPT_FUNCTION(setbuffer)
-#define RTSAN_MAYBE_INTERCEPT_SETLINEBUF INTERCEPT_FUNCTION(setlinebuf)
-#define RTSAN_MAYBE_INTERCEPT_SETVBUF INTERCEPT_FUNCTION(setvbuf)
-#else
-#define RTSAN_MAYBE_INTERCEPT_SETBUF
-#define RTSAN_MAYBE_INTERCEPT_SETBUFFER
-#define RTSAN_MAYBE_INTERCEPT_SETLINEBUF
-#define RTSAN_MAYBE_INTERCEPT_SETVBUF
-#endif
-
INTERCEPTOR(int, puts, const char *s) {
__rtsan_notify_intercepted_call("puts");
return REAL(puts)(s);
@@ -1017,10 +986,6 @@ void __rtsan::InitializeInterceptors() {
RTSAN_MAYBE_INTERCEPT_FOPENCOOKIE;
RTSAN_MAYBE_INTERCEPT_OPEN_MEMSTREAM;
RTSAN_MAYBE_INTERCEPT_FMEMOPEN;
- RTSAN_MAYBE_INTERCEPT_SETBUF;
- RTSAN_MAYBE_INTERCEPT_SETBUFFER;
- RTSAN_MAYBE_INTERCEPT_SETLINEBUF;
- RTSAN_MAYBE_INTERCEPT_SETVBUF;
INTERCEPT_FUNCTION(lseek);
RTSAN_MAYBE_INTERCEPT_LSEEK64;
INTERCEPT_FUNCTION(dup);
diff --git a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
index 2947510b2cfde8..5adbf0fb63de80 100644
--- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
@@ -403,56 +403,6 @@ TEST_F(RtsanFileTest, FmemOpenDiesWhenRealtime) {
}
#endif
-#if SANITIZER_INTERCEPT_SETVBUF
-TEST_F(RtsanFileTest, SetbufDieWhenRealtime) {
- char buffer[BUFSIZ];
- FILE *f = fopen(GetTemporaryFilePath(), "w");
- EXPECT_THAT(f, Ne(nullptr));
-
- auto Func = [&f, &buffer]() { setbuf(f, buffer); };
-
- ExpectRealtimeDeath(Func, "setbuf");
- ExpectNonRealtimeSurvival(Func);
-}
-
-TEST_F(RtsanFileTest, SetbufferDieWhenRealtime) {
- char buffer[1024];
- size_t size = sizeof(buffer);
- FILE *f = fopen(GetTemporaryFilePath(), "w");
- EXPECT_THAT(f, Ne(nullptr));
-
- auto Func = [&f, &buffer, &size]() { setbuffer(f, buffer, size); };
-
- ExpectRealtimeDeath(Func, "setbuffer");
- ExpectNonRealtimeSurvival(Func);
-}
-
-TEST_F(RtsanFileTest, SetvbufDieWhenRealtime) {
- char buffer[1024];
- size_t size = sizeof(buffer);
- FILE *f = fopen(GetTemporaryFilePath(), "w");
- EXPECT_THAT(f, Ne(nullptr));
-
- auto Func = [&f, &buffer, &size]() {
- int r = setvbuf(f, buffer, _IOFBF, size);
- EXPECT_THAT(r, Eq(0));
- };
-
- ExpectRealtimeDeath(Func, "setvbuf");
- ExpectNonRealtimeSurvival(Func);
-}
-
-TEST_F(RtsanFileTest, SetlinebufDieWhenRealtime) {
- FILE *f = fopen(GetTemporaryFilePath(), "w");
- EXPECT_THAT(f, Ne(nullptr));
-
- auto Func = [&f]() { setlinebuf(f); };
-
- ExpectRealtimeDeath(Func, "setlinebuf");
- ExpectNonRealtimeSurvival(Func);
-}
-#endif
-
class RtsanOpenedFileTest : public RtsanFileTest {
protected:
void SetUp() override {
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/198/builds/815 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…d setbuffer (#121616)"
This reverts commit 95db111.