Revert 229222 "Change _ITERATOR_DEBUG_LEVEL to 1 on Release builds"

trunk/src/build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 1686 matching lines @@
         'debug_extra_cflags': '-g -fno-inline -fno-omit-frame-pointer '
                               '-fno-builtin -fno-optimize-sibling-calls',
         'release_extra_cflags': '-g -fno-inline -fno-omit-frame-pointer '
                                 '-fno-builtin -fno-optimize-sibling-calls',
 
         # MSVS flags for TSan on Pin and Windows.
         'win_debug_RuntimeChecks': '0',
         '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',
 
         'linux_use_tcmalloc': 1,
         'release_valgrind_build': 1,
         'werror': '',
         'component': 'static_library',
         'use_system_zlib': 0,
       }],
 
       # Build tweaks for DrMemory.
       # TODO(rnk): Combine with tsan config to share the builder.
       # http://crbug.com/108155
       ['build_for_tool=="drmemory"', {
         # These runtime checks force initialization of stack vars which blocks
         # DrMemory's uninit detection.
         'win_debug_RuntimeChecks': '0',
-        # Iterator debugging is slow. Disable in both Debug and Release
+        # Iterator debugging is slow.
         '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
         # compiler bug, so we use /Ob1 instead.
         'win_release_InlineFunctionExpansion': '1',
         'win_release_OmitFramePointers': '0',
         # Ditto for debug, to support bumping win_debug_Optimization.
         'win_debug_InlineFunctionExpansion': 0,
         'win_debug_OmitFramePointers': 0,
         # Keep the code under #ifndef NVALGRIND.
@@ skipping 103 matching lines @@
       'win_debug_InlineFunctionExpansion%': '',    # empty = default, 0 = off,
       'win_release_InlineFunctionExpansion%': '2', # 1 = only __inline, 2 = max
 
       # VS inserts quite a lot of extra checks to algorithms like
       # std::partial_sort in Debug build which make them O(N^2)
       # instead of O(N*logN). This is particularly slow under memory
       # tools like ThreadSanitizer so we want it to be disablable.
       # 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%':
           '<(DEPTH)\\build\\win\\compatibility.manifest',
 
       # Set to 1 to generate external manifest instead of embedding it for
       # 'executable' target. Does nothing for other target type. This flag is
       # used to make mini_installer compatible with the component build.
       # See http://crbug.com/127233
       'win_use_external_manifest%': 0,
@@ skipping 802 matching lines @@
               }],
               ['win_release_OmitFramePointers==0', {
                 'OmitFramePointers': 'false',
                 # The above is not sufficient (http://crbug.com/106711): it
                 # simply eliminates an explicit "/Oy", but both /O2 and /Ox
                 # perform FPO regardless, so we must explicitly disable.
                 # We still want the false setting above to avoid having
                 # "/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)', ],
           },
           'VCLinkerTool': {
             # LinkIncremental is a tri-state boolean, where 0 means default
             # (i.e., inherit from parent solution), 1 means false, and
             # 2 means true.
             'LinkIncremental': '1',
             # This corresponds to the /PROFILE flag which ensures the PDB
             # file contains FIXUP information (growing the PDB file by about
@@ skipping 2046 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }