Author: gulfemsavrun Date: 2025-01-02T18:22:29-08:00 New Revision: d198e1d914e8bb9522651da345e5aa8ba6917fad
URL: https://github.com/llvm/llvm-project/commit/d198e1d914e8bb9522651da345e5aa8ba6917fad DIFF: https://github.com/llvm/llvm-project/commit/d198e1d914e8bb9522651da345e5aa8ba6917fad.diff LOG: Revert "[compiler-rt][rtsan] fopencookie support. (#120864)" This reverts commit 4b577830033066cfd1b2acf4fcf39950678b27bd. Added: Modified: compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp Removed: ################################################################################ diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp index 072923ab35ae0d..4e51f464b57304 100644 --- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp +++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp @@ -297,12 +297,6 @@ INTERCEPTOR(FILE *, fdopen, int fd, const char *mode) { return REAL(fdopen)(fd, mode); } -INTERCEPTOR(FILE *, fopencookie, void *cookie, const char *mode, - cookie_io_functions_t funcs) { - __rtsan_notify_intercepted_call("fopencookie"); - return REAL(fopencookie)(cookie, mode, funcs); -} - #if SANITIZER_INTERCEPT_OPEN_MEMSTREAM INTERCEPTOR(FILE *, open_memstream, char **buf, size_t *size) { __rtsan_notify_intercepted_call("open_memstream"); @@ -978,7 +972,6 @@ void __rtsan::InitializeInterceptors() { INTERCEPT_FUNCTION(fputs); INTERCEPT_FUNCTION(fdopen); INTERCEPT_FUNCTION(freopen); - INTERCEPT_FUNCTION(fopencookie); RTSAN_MAYBE_INTERCEPT_OPEN_MEMSTREAM; RTSAN_MAYBE_INTERCEPT_FMEMOPEN; INTERCEPT_FUNCTION(lseek); 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 c9c4d7fc4e99ee..b052dd859dcdf6 100644 --- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp +++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp @@ -353,29 +353,6 @@ TEST_F(RtsanFileTest, FopenDiesWhenRealtime) { ExpectNonRealtimeSurvival(Func); } -TEST_F(RtsanFileTest, FopenCookieDieWhenRealtime) { - FILE *f = fopen(GetTemporaryFilePath(), "w"); - EXPECT_THAT(f, Ne(nullptr)); - struct fholder { - FILE *fp; - size_t read; - } fh = {f, 0}; - auto CookieRead = [this](void *cookie, char *buf, size_t size) { - fholder *p = reinterpret_cast<fholder *>(cookie); - p->read = fread(static_cast<void *>(buf), 1, size, p->fp); - EXPECT_NE(0, p->read); - }; - cookie_io_functions_t funcs = {(cookie_read_function_t *)&CookieRead, nullptr, - nullptr, nullptr}; - auto Func = [&fh, &funcs]() { - FILE *f = fopencookie(&fh, "w", funcs); - EXPECT_THAT(f, Ne(nullptr)); - }; - - ExpectRealtimeDeath(Func, "fopencookie"); - ExpectNonRealtimeSurvival(Func); -} - #if SANITIZER_INTERCEPT_OPEN_MEMSTREAM TEST_F(RtsanFileTest, OpenMemstreamDiesWhenRealtime) { char *buffer; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
