Revert windows-specific part of r15937 for debug level 1.

The change in r15937 might have broken a mozilla test under windows. See https://codereview.chromium.org/19384011/

Each case of debug 0,1,2 is now stated explicitly for better clarity in the msvs section. This causes some minor code duplications, which we can squeeze again after toolchain.gypi is in a stable state.

R=dpranke@chromium.org, jkummerow@chromium.org

Review URL: https://codereview.chromium.org/21495002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16018 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index 36d60c2..05933ff 100644 (file)
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -61,11 +61,10 @@
     'v8_enable_backtrace%': 0,
 
     # Speeds up Debug builds:
-    # 0 - compiler optimizations off (debuggable) (default). This may
+    # 0 - Compiler optimizations off (debuggable) (default). This may
     #     be 5x slower than Release (or worse).
-    # 1 - turn on compiler optimizations. and #undef DEBUG/#define NDEBUG.
-    #     This may be hard or impossible to debug. This may still be
-    #     2x slower than Release (or worse).
+    # 1 - Turn on compiler optimizations. This may be hard or impossible to
+    #     debug. This may still be 2x slower than Release (or worse).
     # 2 - Turn on optimizations, and also #undef DEBUG / #define NDEBUG
     #     (but leave V8_ENABLE_CHECKS and most other assertions enabled.
     #     This may cause some v8 tests to fail in the Debug configuration.
@@ -455,14 +454,32 @@
         'msvs_settings': {
           'VCCLCompilerTool': {
             'conditions': [
-              ['component=="shared_library"', {
-                'RuntimeLibrary': '3',  # /MDd
-              }, {
-                'RuntimeLibrary': '1',  # /MTd
-              }],
               ['v8_optimized_debug==0', {
                 'Optimization': '0',
-              }, {
+                'conditions': [
+                  ['component=="shared_library"', {
+                    'RuntimeLibrary': '3',  # /MDd
+                  }, {
+                    'RuntimeLibrary': '1',  # /MTd
+                  }],
+                ],
+              }],
+              ['v8_optimized_debug==1', {
+                'Optimization': '1',
+                'InlineFunctionExpansion': '2',
+                'EnableIntrinsicFunctions': 'true',
+                'FavorSizeOrSpeed': '0',
+                'StringPooling': 'true',
+                'BasicRuntimeChecks': '0',
+                'conditions': [
+                  ['component=="shared_library"', {
+                    'RuntimeLibrary': '3',  # /MDd
+                  }, {
+                    'RuntimeLibrary': '1',  # /MTd
+                  }],
+                ],
+              }],
+              ['v8_optimized_debug==2', {
                 'Optimization': '2',
                 'InlineFunctionExpansion': '2',
                 'EnableIntrinsicFunctions': 'true',
@@ -487,7 +504,11 @@
             'conditions': [
               ['v8_optimized_debug==0', {
                 'LinkIncremental': '2',
-              }, {
+              }],
+              ['v8_optimized_debug==1', {
+                'LinkIncremental': '2',
+              }],
+              ['v8_optimized_debug==2', {
                 'LinkIncremental': '1',
                 'OptimizeReferences': '2',
                 'EnableCOMDATFolding': '2',