[PATCH] D58788: Revert "Revert "[sanitizers] Restore internal_readlink for x32""

[H.J Lu via Phabricator via llvm-commits]

hjl.tools created this revision.
hjl.tools added reviewers: kcc, rnk, eugenis, dvyukov, vitalybuka, pengfei, LuoYuanke.
Herald added subscribers: Sanitizers, kubamracek.
Herald added projects: LLVM, Sanitizers.

This reverts revision 354601 and disables ReadBinaryNameCached check on
Windows since Windows has no working ReadBinaryName.


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D58788

Files:
  lib/sanitizer_common/sanitizer_linux.cc
  lib/sanitizer_common/tests/sanitizer_common_test.cc


Index: lib/sanitizer_common/tests/sanitizer_common_test.cc
===================================================================
--- lib/sanitizer_common/tests/sanitizer_common_test.cc
+++ lib/sanitizer_common/tests/sanitizer_common_test.cc
@@ -438,4 +438,12 @@
   EXPECT_DEATH(address_range.Unmap(base_addr + (PageSize * 2), PageSize), ".*");
 }
 
+// Windows has no working ReadBinaryName.
+#if !SANITIZER_WINDOWS
+TEST(SanitizerCommon, ReadBinaryNameCached) {
+  char buf[256];
+  EXPECT_NE((uptr)0, ReadBinaryNameCached(buf, sizeof(buf)));
+}
+#endif
+
 }  // namespace __sanitizer
Index: lib/sanitizer_common/sanitizer_linux.cc
===================================================================
--- lib/sanitizer_common/sanitizer_linux.cc
+++ lib/sanitizer_common/sanitizer_linux.cc
@@ -400,7 +400,7 @@
   return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,
                           bufsize);
 #else
-  return internal_syscall(SYSCALL(readlink), path, buf, bufsize);
+  return internal_syscall(SYSCALL(readlink), (uptr)path, (uptr)buf, bufsize);
 #endif
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D58788.188751.patch
Type: text/x-patch
Size: 1091 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190228/dae95856/attachment.bin>