Revert "[compiler-rt][asan] Add wcscpy/wcsncpy; enable wcscat/wcsncat on Windows" (#162021)

Reverts #160493 due to buildbot failures e.g.,
#160493 (comment)

The fix-forward (#161624) still
had failures on Darwin, and was reverted in
#162001 i.e., this pull request
completes the revert to green for this patch stack.

Author: thurstond

compiler-rt/lib/asan/asan_interceptors.cpp

@@ -58,20 +58,13 @@ namespace __asan {
 
 static inline uptr MaybeRealStrnlen(const char *s, uptr maxlen) {
 #if SANITIZER_INTERCEPT_STRNLEN
-  if (REAL(strnlen))
+  if (REAL(strnlen)) {
     return REAL(strnlen)(s, maxlen);
-#  endif
+  }
+#endif
   return internal_strnlen(s, maxlen);
 }
 
-static inline uptr MaybeRealWcsnlen(const wchar_t* s, uptr maxlen) {
-#  if SANITIZER_INTERCEPT_WCSNLEN
-  if (REAL(wcsnlen))
-    return REAL(wcsnlen)(s, maxlen);
-#  endif
-  return internal_wcsnlen(s, maxlen);
-}
-
 void SetThreadName(const char *name) {
   AsanThread *t = GetCurrentThread();
   if (t)
@@ -577,20 +570,6 @@ INTERCEPTOR(char *, strcpy, char *to, const char *from) {
   return REAL(strcpy)(to, from);
 }
 
-INTERCEPTOR(wchar_t*, wcscpy, wchar_t* to, const wchar_t* from) {
-  void* ctx;
-  ASAN_INTERCEPTOR_ENTER(ctx, wcscpy);
-  if (!TryAsanInitFromRtl())
-    return REAL(wcscpy)(to, from);
-  if (flags()->replace_str) {
-    uptr size = (internal_wcslen(from) + 1) * sizeof(wchar_t);
-    CHECK_RANGES_OVERLAP("wcscpy", to, size, from, size);
-    ASAN_READ_RANGE(ctx, from, size);
-    ASAN_WRITE_RANGE(ctx, to, size);
-  }
-  return REAL(wcscpy)(to, from);
-}
-
 // Windows doesn't always define the strdup identifier,
 // and when it does it's a macro defined to either _strdup
 // or _strdup_dbg, _strdup_dbg ends up calling _strdup, so
@@ -654,20 +633,6 @@ INTERCEPTOR(char*, strncpy, char *to, const char *from, usize size) {
   return REAL(strncpy)(to, from, size);
 }
 
-INTERCEPTOR(wchar_t*, wcsncpy, wchar_t* to, const wchar_t* from, uptr size) {
-  void* ctx;
-  ASAN_INTERCEPTOR_ENTER(ctx, wcsncpy);
-  AsanInitFromRtl();
-  if (flags()->replace_str) {
-    uptr from_size =
-        Min(size, MaybeRealWcsnlen(from, size) + 1) * sizeof(wchar_t);
-    CHECK_RANGES_OVERLAP("wcsncpy", to, from_size, from, from_size);
-    ASAN_READ_RANGE(ctx, from, from_size);
-    ASAN_WRITE_RANGE(ctx, to, size * sizeof(wchar_t));
-  }
-  return REAL(wcsncpy)(to, from, size);
-}
-
 template <typename Fn>
 static ALWAYS_INLINE auto StrtolImpl(void *ctx, Fn real, const char *nptr,
                                      char **endptr, int base)
@@ -844,11 +809,6 @@ void InitializeAsanInterceptors() {
   ASAN_INTERCEPT_FUNC(strncat);
   ASAN_INTERCEPT_FUNC(strncpy);
   ASAN_INTERCEPT_FUNC(strdup);
-
-  // Intercept wcs* functions.
-  ASAN_INTERCEPT_FUNC(wcscpy);
-  ASAN_INTERCEPT_FUNC(wcsncpy);
-
 #  if ASAN_INTERCEPT___STRDUP
   ASAN_INTERCEPT_FUNC(__strdup);
 #endif

compiler-rt/lib/asan/asan_interceptors.h

@@ -129,7 +129,6 @@ DECLARE_REAL(char*, strchr, const char *str, int c)
 DECLARE_REAL(SIZE_T, strlen, const char *s)
 DECLARE_REAL(char*, strncpy, char *to, const char *from, SIZE_T size)
 DECLARE_REAL(SIZE_T, strnlen, const char *s, SIZE_T maxlen)
-DECLARE_REAL(SIZE_T, wcsnlen, const wchar_t* s, SIZE_T maxlen)
 DECLARE_REAL(char*, strstr, const char *s1, const char *s2)
 
 #  if !SANITIZER_APPLE

compiler-rt/lib/asan/asan_win_static_runtime_thunk.cpp

@@ -63,10 +63,6 @@ INTERCEPT_LIBRARY_FUNCTION_ASAN(strpbrk);
 INTERCEPT_LIBRARY_FUNCTION_ASAN(strspn);
 INTERCEPT_LIBRARY_FUNCTION_ASAN(strstr);
 INTERCEPT_LIBRARY_FUNCTION_ASAN(strtok);
-INTERCEPT_LIBRARY_FUNCTION_ASAN(wcscat);
-INTERCEPT_LIBRARY_FUNCTION_ASAN(wcscpy);
-INTERCEPT_LIBRARY_FUNCTION_ASAN(wcsncat);
-INTERCEPT_LIBRARY_FUNCTION_ASAN(wcsncpy);
 INTERCEPT_LIBRARY_FUNCTION_ASAN(wcslen);
 INTERCEPT_LIBRARY_FUNCTION_ASAN(wcsnlen);
 

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

@@ -551,7 +551,7 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,
 #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD)
 #define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID
 #define SANITIZER_INTERCEPT_WCSLEN 1
-#define SANITIZER_INTERCEPT_WCSCAT (SI_POSIX || SI_WINDOWS)
+#define SANITIZER_INTERCEPT_WCSCAT SI_POSIX
 #define SANITIZER_INTERCEPT_WCSDUP SI_POSIX
 #define SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION (!SI_WINDOWS && SI_NOT_FUCHSIA)
 #define SANITIZER_INTERCEPT_BSD_SIGNAL SI_ANDROID