[compiler-rt] r309637 - [msan] Reverting D36093

[Kostya Kortchinsky via llvm-commits]

Author: cryptoad
Date: Mon Jul 31 15:46:01 2017
New Revision: 309637

URL: http://llvm.org/viewvc/llvm-project?rev=309637&view=rev
Log:
[msan] Reverting D36093

Summary:
Reverting D36093 until I can figure out how to launch the correct tests :/
My apologies.

Reviewers: alekseyshl

Reviewed By: alekseyshl

Subscribers: llvm-commits

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

Modified:
    compiler-rt/trunk/lib/msan/msan_allocator.cc
    compiler-rt/trunk/lib/msan/tests/msan_test.cc

Modified: compiler-rt/trunk/lib/msan/msan_allocator.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_allocator.cc?rev=309637&r1=309636&r2=309637&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan_allocator.cc (original)
+++ compiler-rt/trunk/lib/msan/msan_allocator.cc Mon Jul 31 15:46:01 2017
@@ -255,10 +255,6 @@ void *msan_valloc(uptr size, StackTrace
 
 void *msan_pvalloc(uptr size, StackTrace *stack) {
   uptr PageSize = GetPageSizeCached();
-  if (UNLIKELY(CheckForPvallocOverflow(size, PageSize))) {
-    errno = errno_ENOMEM;
-    return Allocator::FailureHandler::OnBadRequest();
-  }
   // pvalloc(0) should allocate one page.
   size = size ? RoundUpTo(size, PageSize) : PageSize;
   return SetErrnoOnNull(MsanAllocate(stack, size, PageSize, false));

Modified: compiler-rt/trunk/lib/msan/tests/msan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/tests/msan_test.cc?rev=309637&r1=309636&r2=309637&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/tests/msan_test.cc (original)
+++ compiler-rt/trunk/lib/msan/tests/msan_test.cc Mon Jul 31 15:46:01 2017
@@ -3449,17 +3449,6 @@ TEST(MemorySanitizer, pvalloc) {
   EXPECT_EQ(0U, (uintptr_t)p % PageSize);
   EXPECT_EQ(PageSize, __sanitizer_get_allocated_size(p));
   free(p);
-
-  // Overflows in pvalloc should be caught.
-  errno = 0;
-  p = pvalloc((uintptr_t)-PageSize);
-  EXPECT_EQ(p, nullptr);
-  EXPECT_EQ(errno, ENOMEM);
-
-  errno = 0;
-  p = pvalloc((uintptr_t)-1);
-  EXPECT_EQ(p, nullptr);
-  EXPECT_EQ(errno, ENOMEM);
 }
 #endif