Allocator shims working on VS2015.

base/process/memory_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include "base/process/memory.h"
 
 #include <stddef.h>
 
 #include <limits>
 
+#include "base/allocator/allocator_check.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
+#include "base/memory/aligned_memory.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #if defined(OS_POSIX)
 #include <errno.h>
 #endif
@@ skipping 107 matching lines @@
   // heap corruption.
   ASSERT_DEATH(free(buf), "attempting free on address which "
       "was not malloc\\(\\)-ed");
 #else
   ADD_FAILURE() << "This test is not supported in this build configuration.";
 #endif
 }
 
 #endif  // defined(OS_MACOSX)
 
+TEST(MemoryTest, AllocatorShimWorking) {

[Primiano Tucci (use gerrit), 2016/03/29 18:46:07]

Not sure how much this will add. It's very easy to end up with different build
flags for unittests vs main executable. In the main executable we have a runtime
check in place in ContentMainRunner.
But I guess this won't harm as a first-level smoke test in the CQ.

[Will Harris, 2016/03/29 18:56:20]

Ack. I added it after I tripped it while developing the CL, and wanted an easier
way to find out it was working rather than compiling all 20,000 files needed for
Chrome.

[Primiano Tucci (use gerrit), 2016/03/29 19:30:03]

Acknowledged.

+  ASSERT_TRUE(base::allocator::IsAllocatorInitialized());
+}
+
 // Android doesn't implement set_new_handler, so we can't use the
 // OutOfMemoryTest cases. OpenBSD does not support these tests either.
 // Don't test these on ASan/TSan/MSan configurations: only test the real
 // allocator.
 // Windows only supports these tests with the allocator shim in place.
 #if !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&   \
     !(defined(OS_WIN) && !defined(ALLOCATOR_SHIM)) && \
     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 
 namespace {
@@ skipping 60 matching lines @@
     }, kOomRegex);
 }
 
 TEST_F(OutOfMemoryDeathTest, Calloc) {
   ASSERT_DEATH({
       SetUpInDeathAssert();
       value_ = calloc(1024, test_size_ / 1024L);
     }, kOomRegex);
 }
 
+TEST_F(OutOfMemoryDeathTest, AlignedAlloc) {
+  ASSERT_DEATH({
+      SetUpInDeathAssert();
+      value_ = base::AlignedAlloc(test_size_, 8);
+    }, kOomRegex);
+}
+
+TEST_F(OutOfMemoryDeathTest, AlignedMalloc) {
+  ASSERT_DEATH({
+      SetUpInDeathAssert();
+      value_ = _aligned_malloc(test_size_, 8);
+    }, kOomRegex);
+}
+
+TEST_F(OutOfMemoryDeathTest, AlignedRealloc) {
+  ASSERT_DEATH({
+      SetUpInDeathAssert();
+      value_ = _aligned_realloc(NULL, test_size_, 8);
+    }, kOomRegex);
+}
+
 // OS X has no 2Gb allocation limit.
 // See https://crbug.com/169327.
 #if !defined(OS_MACOSX)
 TEST_F(OutOfMemoryDeathTest, SecurityNew) {
   ASSERT_DEATH({
       SetUpInDeathAssert();
       value_ = operator new(insecure_test_size_);
     }, kOomRegex);
 }
 
@@ skipping 17 matching lines @@
       value_ = realloc(NULL, insecure_test_size_);
     }, kOomRegex);
 }
 
 TEST_F(OutOfMemoryDeathTest, SecurityCalloc) {
   ASSERT_DEATH({
       SetUpInDeathAssert();
       value_ = calloc(1024, insecure_test_size_ / 1024L);
     }, kOomRegex);
 }
+
+TEST_F(OutOfMemoryDeathTest, SecurityAlignedAlloc) {
+  ASSERT_DEATH({
+      SetUpInDeathAssert();
+      value_ = base::AlignedAlloc(insecure_test_size_, 8);
+    }, kOomRegex);
+}
+
+TEST_F(OutOfMemoryDeathTest, SecurityAlignedMalloc) {
+  ASSERT_DEATH({
+      SetUpInDeathAssert();
+      value_ = _aligned_malloc(insecure_test_size_, 8);
+    }, kOomRegex);
+}
+
+TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) {
+  ASSERT_DEATH({
+      SetUpInDeathAssert();
+      value_ = _aligned_realloc(NULL, insecure_test_size_, 8);
+    }, kOomRegex);
+}
+
 #endif  // !defined(OS_MACOSX)
 
 #if defined(OS_LINUX)
 
 TEST_F(OutOfMemoryDeathTest, Valloc) {
   ASSERT_DEATH({
       SetUpInDeathAssert();
       value_ = valloc(test_size_);
     }, kOomRegex);
 }
@@ skipping 200 matching lines @@
   for (size_t i = 0; i < (kSafeCallocItems * kSafeCallocSize); ++i)
     EXPECT_EQ(0, bytes[i]);
   free(value_);
 
   EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
   EXPECT_TRUE(value_ == NULL);
 }
 #endif  // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 #endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !(defined(OS_WIN) &&
         // !defined(ALLOCATOR_SHIM)) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)