Merge the latest changes to master in the vs2015 branch.

syzygy/agent/asan/rtl_unittest.cc

 // Copyright 2012 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 448 matching lines @@
         false, &dst[0], &src[memory_length_], 0xDEADDEAD, HEAP_BUFFER_OVERFLOW);
     tester.ExpectSpecialMemoryErrorIsDetected(
         check_access_fn, MemoryAccessorTester::DIRECTION_FORWARD,
         true, &dst[memory_length_], &src[0], 0xDEADDEAD, HEAP_BUFFER_OVERFLOW);
   }
 
   FreeMemoryBuffers();
 }
 
 TEST_F(AsanRtlTest, AsanPrefixedSpecialInstructionCheckGoodAccess) {
-  static const char* function_names[] = {
-      "asan_check_repz_4_byte_movs_access",
-      "asan_check_repz_4_byte_cmps_access",
-      "asan_check_repz_4_byte_stos_access"
-  };
+  static const char* function_names[] = {"asan_check_repz_4_byte_lods_access",
+                                         "asan_check_repz_4_byte_movs_access",
+                                         "asan_check_repz_4_byte_cmps_access",
+                                         "asan_check_repz_4_byte_stos_access"};
 
   // Allocate memory space.
   AllocMemoryBuffers(kAllocSize, sizeof(uint32_t));
   uint32_t* src = reinterpret_cast<uint32_t*>(memory_src_);
   uint32_t* dst = reinterpret_cast<uint32_t*>(memory_dst_);
 
   // Validate memory accesses.
   for (int32_t function = 0; function < arraysize(function_names); ++function) {
     FARPROC check_access_fn =
         ::GetProcAddress(asan_rtl_, function_names[function]);
     ASSERT_TRUE(check_access_fn != NULL);
 
     MemoryAccessorTester tester;
     tester.ExpectSpecialMemoryErrorIsDetected(
         check_access_fn, MemoryAccessorTester::DIRECTION_FORWARD,
         false, &dst[0], &src[0], memory_length_, UNKNOWN_BAD_ACCESS);
   }
 
   FreeMemoryBuffers();
 }
 
 TEST_F(AsanRtlTest, AsanPrefixedSpecialInstructionCheckBadAccess) {
-  static const char* function_names[] = {
-      "asan_check_repz_4_byte_movs_access",
-      "asan_check_repz_4_byte_cmps_access",
-      "asan_check_repz_4_byte_stos_access"
-  };
+  static const char* function_names[] = {"asan_check_repz_4_byte_lods_access",
+                                         "asan_check_repz_4_byte_movs_access",
+                                         "asan_check_repz_4_byte_cmps_access",
+                                         "asan_check_repz_4_byte_stos_access"};
 
   // Allocate memory space.
   AllocMemoryBuffers(kAllocSize, sizeof(uint32_t));
   uint32_t* src = reinterpret_cast<uint32_t*>(memory_src_);
   uint32_t* dst = reinterpret_cast<uint32_t*>(memory_dst_);
 
   // Validate memory accesses.
   for (int32_t function = 0; function < arraysize(function_names); ++function) {
     FARPROC check_access_fn =
         ::GetProcAddress(asan_rtl_, function_names[function]);
     ASSERT_TRUE(check_access_fn != NULL);
 
     MemoryAccessorTester tester;
     tester.ExpectSpecialMemoryErrorIsDetected(
         check_access_fn, MemoryAccessorTester::DIRECTION_FORWARD,
         true, &dst[0], &src[0], memory_length_ + 1, HEAP_BUFFER_OVERFLOW);
     tester.ExpectSpecialMemoryErrorIsDetected(
         check_access_fn, MemoryAccessorTester::DIRECTION_FORWARD,
         true, &dst[-1], &src[-1], memory_length_, HEAP_BUFFER_UNDERFLOW);
     tester.ExpectSpecialMemoryErrorIsDetected(
         check_access_fn, MemoryAccessorTester::DIRECTION_FORWARD,
         true, &dst[-1], &src[0], memory_length_, HEAP_BUFFER_UNDERFLOW);
   }
 
   FreeMemoryBuffers();
 }
 
 TEST_F(AsanRtlTest, AsanDirectionSpecialInstructionCheckGoodAccess) {
-  static const char* function_names[] = {
-      "asan_check_repz_4_byte_movs_access",
-      "asan_check_repz_4_byte_cmps_access",
-      "asan_check_repz_4_byte_stos_access"
-  };
+  static const char* function_names[] = {"asan_check_repz_4_byte_lods_access",
+                                         "asan_check_repz_4_byte_movs_access",
+                                         "asan_check_repz_4_byte_cmps_access",
+                                         "asan_check_repz_4_byte_stos_access"};
 
   // Allocate memory space.
   AllocMemoryBuffers(kAllocSize, sizeof(uint32_t));
   uint32_t* src = reinterpret_cast<uint32_t*>(memory_src_);
   uint32_t* dst = reinterpret_cast<uint32_t*>(memory_dst_);
 
   // Validate memory accesses.
   for (int32_t function = 0; function < arraysize(function_names); ++function) {
     FARPROC check_access_fn =
         ::GetProcAddress(asan_rtl_, function_names[function]);
     ASSERT_TRUE(check_access_fn != NULL);
 
     MemoryAccessorTester tester;
     tester.ExpectSpecialMemoryErrorIsDetected(
         check_access_fn, MemoryAccessorTester::DIRECTION_BACKWARD,
         false, &dst[memory_length_ - 1],
         &src[memory_length_ - 1], memory_length_,
         UNKNOWN_BAD_ACCESS);
   }
 
   FreeMemoryBuffers();
 }
 
 TEST_F(AsanRtlTest, AsanSpecialInstructionCheckZeroAccess) {
-  static const char* function_names[] = {
-      "asan_check_repz_1_byte_movs_access",
-      "asan_check_repz_1_byte_cmps_access",
-      "asan_check_repz_1_byte_stos_access",
-      "asan_check_repz_2_byte_movs_access",
-      "asan_check_repz_2_byte_cmps_access",
-      "asan_check_repz_2_byte_stos_access",
-      "asan_check_repz_4_byte_movs_access",
-      "asan_check_repz_4_byte_cmps_access",
-      "asan_check_repz_4_byte_stos_access"
-  };
+  static const char* function_names[] = {"asan_check_repz_1_byte_lods_access",
+                                         "asan_check_repz_1_byte_movs_access",
+                                         "asan_check_repz_1_byte_cmps_access",
+                                         "asan_check_repz_1_byte_stos_access",
+                                         "asan_check_repz_2_byte_lods_access",
+                                         "asan_check_repz_2_byte_movs_access",
+                                         "asan_check_repz_2_byte_cmps_access",
+                                         "asan_check_repz_2_byte_stos_access",
+                                         "asan_check_repz_4_byte_lods_access",
+                                         "asan_check_repz_4_byte_movs_access",
+                                         "asan_check_repz_4_byte_cmps_access",
+                                         "asan_check_repz_4_byte_stos_access"};
 
   // Allocate memory space.
   AllocMemoryBuffers(kAllocSize, sizeof(uint32_t));
   uint32_t* src = reinterpret_cast<uint32_t*>(memory_src_);
   uint32_t* dst = reinterpret_cast<uint32_t*>(memory_dst_);
 
   // Validate memory accesses.
   for (int32_t function = 0; function < arraysize(function_names); ++function) {
     FARPROC check_access_fn =
         ::GetProcAddress(asan_rtl_, function_names[function]);
     ASSERT_TRUE(check_access_fn != NULL);
 
     // A prefixed instruction with a count of zero do not have side effects.
     MemoryAccessorTester tester;
     tester.ExpectSpecialMemoryErrorIsDetected(
         check_access_fn, MemoryAccessorTester::DIRECTION_FORWARD,
         false, &dst[-1], &src[-1], 0, UNKNOWN_BAD_ACCESS);
   }
 
   FreeMemoryBuffers();
 }
 
 TEST_F(AsanRtlTest, AsanSpecialInstructionCheckShortcutAccess) {
   static const char* function_names[] = {
+      "asan_check_repz_1_byte_lods_access",
       "asan_check_repz_1_byte_cmps_access",
       "asan_check_repz_2_byte_cmps_access",
       "asan_check_repz_4_byte_cmps_access",
   };
 
   // Allocate memory space.
   AllocMemoryBuffers(kAllocSize, sizeof(uint32_t));
   uint32_t* src = reinterpret_cast<uint32_t*>(memory_src_);
   uint32_t* dst = reinterpret_cast<uint32_t*>(memory_dst_);
 
@@ skipping 59 matching lines @@
   EXPECT_EQ("Enabled", experiments["SyzyASANLargeBlockHeap"]);
   EXPECT_EQ("Disabled", experiments["SyzyASANCrashpad"]);
 
   // This implicitly asserts the full contents of the map by asserting
   // on the size after looking up the expected keys.
   EXPECT_EQ(3U, experiments.size());
 }
 
 }  // namespace asan
 }  // namespace agent