Merge the latest changes to master in the vs2015 branch.

syzygy/instrument/transforms/asan_transform.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 135 matching lines @@
   }
 }
 
 // Returns true if opcode @p opcode is a special instruction.
 // Memory checks for special instructions (string instructions, instructions
 // with prefix, etc) are handled by calling specialized functions rather than
 // the standard memory checks.
 bool IsSpecialInstruction(uint16_t opcode) {
   switch (opcode) {
     case I_CMPS:
+    case I_LODS:
+    case I_MOVS:
     case I_STOS:
-    case I_MOVS:
       return true;
 
     default:
       return false;
   }
 }
 
 // Decodes the first O_MEM or O_SMEM operand of @p instr, if any to the
 // corresponding Operand.
 bool DecodeMemoryAccess(const Instruction& instr,
@@ skipping 457 matching lines @@
 
   MemoryAccessInfo write_info_10 =
       { AsanBasicBlockTransform::kWriteAccess, 10, 0, true };
   access_hook_param_vec.push_back(write_info_10);
   if (use_liveness_analysis) {
     write_info_10.save_flags = false;
     access_hook_param_vec.push_back(write_info_10);
   }
 
   // Import the hooks for string/prefix memory accesses.
-  const _InstructionType strings[] = { I_CMPS, I_MOVS, I_STOS };
+  const _InstructionType strings[] = {I_CMPS, I_LODS, I_MOVS, I_STOS};
   int strings_length = sizeof(strings)/sizeof(_InstructionType);
 
   for (int access_size = 1; access_size <= 4; access_size *= 2) {
     for (int inst = 0; inst < strings_length; ++inst) {
       MemoryAccessInfo repz_inst_info = {
          AsanBasicBlockTransform::kRepzAccess,
          access_size,
          strings[inst],
          true
       };
@@ skipping 1151 matching lines @@
     return left.mode < right.mode;
   if (left.size != right.size)
     return left.size < right.size;
   if (left.save_flags != right.save_flags)
     return left.save_flags < right.save_flags;
   return left.opcode < right.opcode;
 }
 
 }  // namespace transforms
 }  // namespace instrument