3 additions to common.gypi to control FPO and general cflags for Windows tool builds

build/common.gypi

 # Copyright (c) 2011 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 909 matching lines @@
 
       # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.html
       'mac_release_optimization%': '3', # Use -O3 unless overridden
       'mac_debug_optimization%': '0',   # Use -O0 unless overridden
 
       # See http://msdn.microsoft.com/en-us/library/aa652360(VS.71).aspx
       'win_release_Optimization%': '2', # 2 = /Os
       'win_debug_Optimization%': '0',   # 0 = /Od
 
       # See http://msdn.microsoft.com/en-us/library/2kxx5t2c(v=vs.80).aspx
+      # Tri-state: blank is default, 1 on, 0 off
       'win_release_OmitFramePointers%': '1',
+      # Tri-state: blank is default, 1 on, 0 off
+      'win_debug_OmitFramePointers%': '',
 
       # See http://msdn.microsoft.com/en-us/library/8wtf2dfz(VS.71).aspx
       'win_debug_RuntimeChecks%': '3',    # 3 = all checks enabled, 0 = off
 
       # See http://msdn.microsoft.com/en-us/library/47238hez(VS.71).aspx
       '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',
 
       'release_extra_cflags%': '',
       'debug_extra_cflags%': '',
       'release_valgrind_build%': 0,
 
+      # the non-qualified versions are widely assumed to be *nix-only
+      'win_release_extra_cflags%': '',
+      'win_debug_extra_cflags%': '',
+
       # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600
       'enable_wexit_time_destructors%': '<(enable_wexit_time_destructors)',
 
       # Only used by Windows build for now.  Can be used to build into a
       # differet output directory, e.g., a build_dir_prefix of VS2010_ would
       # output files in src/build/VS2010_{Debug,Release}.
       'build_dir_prefix%': '',
 
       'conditions': [
         ['OS=="win" and component=="shared_library"', {
@@ skipping 472 matching lines @@
               ['win_debug_InlineFunctionExpansion==0', {
                 'AdditionalOptions': ['/Ob0'],
               }],
               ['win_debug_InlineFunctionExpansion!=""', {
                 'InlineFunctionExpansion':
                   '<(win_debug_InlineFunctionExpansion)',
               }],
               ['win_debug_disable_iterator_debugging==1', {
                 'PreprocessorDefinitions': ['_HAS_ITERATOR_DEBUGGING=0'],
               }],
+
+              # if win_debug_OmitFramePointers is blank, leave as default

[M-A Ruel, 2011/12/16 21:33:01]

There are cases where we enable optimizations in debug configurations?

[Derek Bruening, 2011/12/16 22:01:14]

We are now building Debug chrome with /O1 when we make a build targeted to run
under Dr. Memory (for improved performance) which does perform some
optimizations

[M-A Ruel, 2011/12/16 22:44:32]

This is a bit sad, I would have preferred to assume debug is debug. Oh well.

+              ['win_debug_OmitFramePointers==1', {
+                'OmitFramePointers': 'true',
+              }],
+              ['win_debug_OmitFramePointers==0', {
+                'OmitFramePointers': 'false',

[brettw, 2011/12/16 21:32:42]

Just curious: would it be better to change OmitFramePonters = false to mean
"/Oy-" ?

[Derek Bruening, 2011/12/16 22:01:14]

Yes, if we could, but we don't control that: Microsoft does.  It is rather
strange that OmitFramePointers=false still performs FPO with /O2 or /Ox but
that's the way it is (for VS2008 at least).

+                # 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-'],
+              }],
             ],
+            'AdditionalOptions': [ '<@(win_debug_extra_cflags)', ],
           },
           'VCLinkerTool': {
             'LinkIncremental': '<(msvs_debug_link_incremental)',
             # ASLR makes debugging with windbg difficult because Chrome.exe and
             # Chrome.dll share the same base name. As result, windbg will
             # name the Chrome.dll module like chrome_<base address>, where
             # <base address> typically changes with each launch. This in turn
             # means that breakpoints in Chrome.dll don't stick from one launch
             # to the next. For this reason, we turn ASLR off in debug builds.
             # Note that this is a three-way bool, where 0 means to pick up
@@ skipping 38 matching lines @@
               # "default inlining", not "/Ob0".
               # Thus, we have to handle InlineFunctionExpansion==0 separately.
               ['win_release_InlineFunctionExpansion==0', {
                 'AdditionalOptions': ['/Ob0'],
               }],
               ['win_release_InlineFunctionExpansion!=""', {
                 'InlineFunctionExpansion':
                   '<(win_release_InlineFunctionExpansion)',
               }],
 
+              # if win_release_OmitFramePointers is blank, leave as default
               ['win_release_OmitFramePointers==1', {
                 'OmitFramePointers': 'true',
               }],
               ['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-'],
               }],
             ],
+            '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
             # 5%) but does not otherwise alter the output binary. This
             # information is used by the Syzygy optimization tool when
@@ skipping 1154 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',
   },
 }