Resolve already committed changes

Author: jakeegan

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc

@@ -953,7 +953,7 @@ INTERCEPTOR(double, frexp, double x, int *exp) {
 #define INIT_FREXP
 #endif  // SANITIZER_INTERCEPT_FREXP
 
-#if SANITIZER_INTERCEPT_FREXPF
+#if SANITIZER_INTERCEPT_FREXPF_FREXPL
 INTERCEPTOR(float, frexpf, float x, int *exp) {
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, frexpf, x, exp);
@@ -963,12 +963,6 @@ INTERCEPTOR(float, frexpf, float x, int *exp) {
   return res;
 }
 
-#  define INIT_FREXPF COMMON_INTERCEPT_FUNCTION(frexpf);
-#else
-#  define INIT_FREXPF
-#endif
-
-#if SANITIZER_INTERCEPT_FREXPL
 INTERCEPTOR(long double, frexpl, long double x, int *exp) {
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, frexpl, x, exp);
@@ -978,10 +972,12 @@ INTERCEPTOR(long double, frexpl, long double x, int *exp) {
   return res;
 }
 
-#  define INIT_FREXPL COMMON_INTERCEPT_FUNCTION_LDBL(frexpl)
+#define INIT_FREXPF_FREXPL           \
+   COMMON_INTERCEPT_FUNCTION(frexpf); \
+   COMMON_INTERCEPT_FUNCTION_LDBL(frexpl)
 #else
-#  define INIT_FREXPL
-#endif
+#define INIT_FREXPF_FREXPL
+#endif  // SANITIZER_INTERCEPT_FREXPF_FREXPL
 
 #if SI_POSIX
 static void write_iovec(void *ctx, struct __sanitizer_iovec *iovec,
@@ -3938,11 +3934,7 @@ INTERCEPTOR(SIZE_T, wcrtomb, char *dest, wchar_t src, void *ps) {
   if (res != ((SIZE_T)-1)) {
     CHECK_LE(res, sizeof(local_dest));
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, res);
-#  if !SANITIZER_AIX
     REAL(memcpy)(dest, local_dest, res);
-#  else
-    internal_memcpy(dest, local_dest, res);
-#  endif
   }
   return res;
 }
@@ -3964,11 +3956,7 @@ INTERCEPTOR(int, wctomb, char *dest, wchar_t src) {
   if (res != -1) {
     CHECK_LE(res, sizeof(local_dest));
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, res);
-#  if !SANITIZER_AIX
     REAL(memcpy)(dest, local_dest, res);
-#  else
-    internal_memcpy(dest, local_dest, res);
-#  endif
   }
   return res;
 }
@@ -10440,8 +10428,7 @@ static void InitializeCommonInterceptors() {
   INIT_ISOC99_PRINTF;
   INIT_SETPROCTITLE;
   INIT_FREXP;
-  INIT_FREXPF;
-  INIT_FREXPL;
+  INIT_FREXPF_FREXPL;
   INIT_GETPWNAM_AND_FRIENDS;
   INIT_GETPWNAM_R_AND_FRIENDS;
   INIT_GETPWENT;

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

@@ -251,7 +251,7 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,
 #define SANITIZER_INTERCEPT___PRINTF_CHK \
   (SANITIZER_INTERCEPT_PRINTF && SI_GLIBC)
 
-// AIX libc does not export FREXP and FREXP.
+// AIX libc does not export FREXP and FREXPF.
 #define SANITIZER_INTERCEPT_FREXP (SI_NOT_FUCHSIA && SI_NOT_AIX)
 #define SANITIZER_INTERCEPT_FREXPF (SI_POSIX && SI_NOT_AIX)
 #define SANITIZER_INTERCEPT_FREXPL SI_POSIX