Change _ITERATOR_DEBUG_LEVEL to 1 on Release builds

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 769d26c0d30ea1a9a2d4fcf50a60fbdf7dcb7575..7dafa1e017cb552448c8b4c2a5528a4c80805b5d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1713,6 +1713,7 @@
         'win_debug_disable_iterator_debugging': '1',
         'win_debug_Optimization': '1',
         'win_debug_InlineFunctionExpansion': '0',
+        'win_release_disable_iterator_debugging': '1',
         'win_release_InlineFunctionExpansion': '0',
         'win_release_OmitFramePointers': '0',
 
@@ -1730,8 +1731,9 @@
         # These runtime checks force initialization of stack vars which blocks
         # DrMemory's uninit detection.
         'win_debug_RuntimeChecks': '0',
-        # Iterator debugging is slow.
+        # Iterator debugging is slow. Disable in both Debug and Release
         'win_debug_disable_iterator_debugging': '1',
+        'win_release_disable_iterator_debugging': '1',
         # Try to disable optimizations that mess up stacks in a release build.
         # DrM-i#1054 (http://code.google.com/p/drmemory/issues/detail?id=1054)
         # /O2 and /Ob0 (disable inline) cannot be used together because of a
@@ -1855,6 +1857,11 @@
       # See http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx
       'win_debug_disable_iterator_debugging%': '0',
 
+      # We now enable partial iterator debugging on Release builds but
+      # we want to make it disablable for release tsan and drmemory builds
+      # see http://crbug.com/289691
+      'win_release_disable_iterator_debugging%': '0',
+
       # An application manifest fragment to declare compatibility settings for
       # 'executable' targets. Ignored in other target type.
       'win_exe_compatibility_manifest%':
@@ -2676,6 +2683,13 @@
                 # "/Oy /Oy-" and warnings about overriding.
                 'AdditionalOptions': ['/Oy-'],
               }],
+              ['win_release_disable_iterator_debugging!=1', {
+                # VS2010 changed default _ITERATOR_DEBUG_LEVEL to 0
+                # on Release builds so we change it back to 1 to restore these
+                # checks, except if explicitly disabled
+                # See http://crbug.com/289691
+                'PreprocessorDefinitions': ['_ITERATOR_DEBUG_LEVEL=1'],
+              }],
             ],
             'AdditionalOptions': [ '<@(win_release_extra_cflags)', ],
           },