[compiler-rt] r359213 - [NFC][Sanitizer] Extract GetFuncAddr from GetRealFunctionAddress

[Julian Lettner via llvm-commits]

Author: yln
Date: Thu Apr 25 10:46:29 2019
New Revision: 359213

URL: http://llvm.org/viewvc/llvm-project?rev=359213&view=rev
Log:
[NFC][Sanitizer] Extract GetFuncAddr from GetRealFunctionAddress

Summary:
Hopefully, this will enable cleanup/removal of GetRealFunctionAddress in
follow-up commits.

Subscribers: #sanitizers, llvm-commits

Tags: #sanitizers, #llvm

Differential Revision: https://reviews.llvm.org/D61110

Modified:
    compiler-rt/trunk/lib/interception/interception_linux.cc
    compiler-rt/trunk/lib/interception/interception_linux.h
    compiler-rt/trunk/lib/interception/tests/interception_linux_test.cc

Modified: compiler-rt/trunk/lib/interception/interception_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/interception_linux.cc?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/interception_linux.cc (original)
+++ compiler-rt/trunk/lib/interception/interception_linux.cc Thu Apr 25 10:46:29 2019
@@ -35,27 +35,32 @@ static int StrCmp(const char *s1, const
 
 bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
     uptr real, uptr wrapper) {
+  *func_addr = (uptr)GetFuncAddr(func_name);
+  return real == wrapper;
+}
+
+void *GetFuncAddr(const char *name) {
 #if SANITIZER_NETBSD
   // FIXME: Find a better way to handle renames
-  if (StrCmp(func_name, "sigaction"))
-    func_name = "__sigaction14";
+  if (StrCmp(name, "sigaction"))
+    name = "__sigaction14";
 #endif
-  *func_addr = (uptr)dlsym(RTLD_NEXT, func_name);
-  if (!*func_addr) {
+  void *addr = dlsym(RTLD_NEXT, name);
+  if (!addr) {
     // If the lookup using RTLD_NEXT failed, the sanitizer runtime library is
     // later in the library search order than the DSO that we are trying to
     // intercept, which means that we cannot intercept this function. We still
     // want the address of the real definition, though, so look it up using
     // RTLD_DEFAULT.
-    *func_addr = (uptr)dlsym(RTLD_DEFAULT, func_name);
+    addr = dlsym(RTLD_DEFAULT, name);
   }
-  return real == wrapper;
+  return addr;
 }
 
 // Android and Solaris do not have dlvsym
 #if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-void *GetFuncAddrVer(const char *func_name, const char *ver) {
-  return dlvsym(RTLD_NEXT, func_name, ver);
+void *GetFuncAddrVer(const char *name, const char *ver) {
+  return dlvsym(RTLD_NEXT, name, ver);
 }
 #endif  // !SANITIZER_ANDROID
 

Modified: compiler-rt/trunk/lib/interception/interception_linux.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/interception_linux.h?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/interception_linux.h (original)
+++ compiler-rt/trunk/lib/interception/interception_linux.h Thu Apr 25 10:46:29 2019
@@ -25,7 +25,8 @@ namespace __interception {
 // returns true if a function with the given name was found.
 bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
     uptr real, uptr wrapper);
-void *GetFuncAddrVer(const char *func_name, const char *ver);
+void *GetFuncAddr(const char *name);
+void *GetFuncAddrVer(const char *name, const char *ver);
 }  // namespace __interception
 
 #define INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)                          \

Modified: compiler-rt/trunk/lib/interception/tests/interception_linux_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/tests/interception_linux_test.cc?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/tests/interception_linux_test.cc (original)
+++ compiler-rt/trunk/lib/interception/tests/interception_linux_test.cc Thu Apr 25 10:46:29 2019
@@ -44,6 +44,11 @@ TEST(Interception, GetRealFunctionAddres
   EXPECT_EQ(0U, dummy_address);
 }
 
+TEST(Interception, GetFuncAddr) {
+  EXPECT_NE(GetFuncAddr("malloc"), nullptr);
+  EXPECT_EQ(GetFuncAddr("does_not_exist"), nullptr);
+}
+
 TEST(Interception, Basic) {
   ASSERT_TRUE(INTERCEPT_FUNCTION(isdigit));