[llvm-commits] [compiler-rt] r157986 - in /compiler-rt/trunk/lib/asan: asan_internal.h asan_linux.cc asan_mac.cc asan_rtl.cc asan_win.cc

[Alexey Samsonov]

Author: samsonov
Date: Tue Jun  5 02:25:47 2012
New Revision: 157986

URL: http://llvm.org/viewvc/llvm-project?rev=157986&view=rev
Log:
[ASan] use internal_open from sanitizer_libc in ASan runtime

Modified:
    compiler-rt/trunk/lib/asan/asan_internal.h
    compiler-rt/trunk/lib/asan/asan_linux.cc
    compiler-rt/trunk/lib/asan/asan_mac.cc
    compiler-rt/trunk/lib/asan/asan_rtl.cc
    compiler-rt/trunk/lib/asan/asan_win.cc

Modified: compiler-rt/trunk/lib/asan/asan_internal.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=157986&r1=157985&r2=157986&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_internal.h (original)
+++ compiler-rt/trunk/lib/asan/asan_internal.h Tue Jun  5 02:25:47 2012
@@ -157,7 +157,6 @@
 // asan_linux.cc / asan_mac.cc / asan_win.cc
 void *AsanDoesNotSupportStaticLinkage();
 bool AsanShadowRangeIsAvailable();
-int AsanOpenReadonly(const char* filename);
 const char *AsanGetEnv(const char *name);
 void AsanDumpProcessMap();
 

Modified: compiler-rt/trunk/lib/asan/asan_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_linux.cc?rev=157986&r1=157985&r2=157986&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_linux.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_linux.cc Tue Jun  5 02:25:47 2012
@@ -114,10 +114,6 @@
   return (uptr)syscall(__NR_write, fd, buf, count);
 }
 
-int AsanOpenReadonly(const char* filename) {
-  return syscall(__NR_open, filename, O_RDONLY);
-}
-
 // Like getenv, but reads env directly from /proc and does not use libc.
 // This function should be called first inside __asan_init.
 const char* AsanGetEnv(const char* name) {

Modified: compiler-rt/trunk/lib/asan/asan_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mac.cc?rev=157986&r1=157985&r2=157986&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_mac.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_mac.cc Tue Jun  5 02:25:47 2012
@@ -138,10 +138,6 @@
   }
 }
 
-int AsanOpenReadonly(const char* filename) {
-  return open(filename, O_RDONLY);
-}
-
 const char *AsanGetEnv(const char *name) {
   char ***env_ptr = _NSGetEnviron();
   CHECK(env_ptr);

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=157986&r1=157985&r2=157986&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Tue Jun  5 02:25:47 2012
@@ -21,6 +21,7 @@
 #include "asan_stats.h"
 #include "asan_thread.h"
 #include "asan_thread_registry.h"
+#include "sanitizer_common/sanitizer_libc.h"
 
 namespace __asan {
 using namespace __sanitizer;
@@ -86,7 +87,7 @@
   *buff_size = 0;
   // The files we usually open are not seekable, so try different buffer sizes.
   for (uptr size = kMinFileLen; size <= max_len; size *= 2) {
-    int fd = AsanOpenReadonly(file_name);
+    fd_t fd = internal_open(file_name, /*write*/ false);
     if (fd < 0) return 0;
     AsanUnmapOrDie(*buff, *buff_size);
     *buff = (char*)AsanMmapSomewhereOrDie(size, __FUNCTION__);

Modified: compiler-rt/trunk/lib/asan/asan_win.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_win.cc?rev=157986&r1=157985&r2=157986&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_win.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_win.cc Tue Jun  5 02:25:47 2012
@@ -69,10 +69,6 @@
 
 // FIXME: Looks like these functions are not needed and are linked in by the
 // code unreachable on Windows. We should clean this up.
-int AsanOpenReadonly(const char* filename) {
-  UNIMPLEMENTED();
-}
-
 uptr AsanRead(int fd, void *buf, uptr count) {
   UNIMPLEMENTED();
 }