deps,v8: fix gypfile bug

PR-URL: https://github.com/nodejs/node/pull/23704
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>

3 files changed, 115 insertions, 166 deletions

diff --git a/common.gypi b/common.gypi
index d9a0ac6727..779073a635 100644
--- a/common.gypi
+++ b/common.gypi
@@ -30,7 +30,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.7',
+    'v8_embedder_string': '-node.8',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,
diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi
index ea8f1c2f00..4860c5b772 100644
--- a/deps/v8/gypfiles/toolchain.gypi
+++ b/deps/v8/gypfiles/toolchain.gypi
@@ -1134,121 +1134,7 @@
       }],
     ],  # conditions
     'configurations': {
-      # Abstract configuration for v8_optimized_debug == 0.
-      'DebugBase0': {
-        'abstract': 1,
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'Optimization': '0',
-            'conditions': [
-              ['component=="shared_library" or force_dynamic_crt==1', {
-                'RuntimeLibrary': '3',  # /MDd
-              }, {
-                'RuntimeLibrary': '1',  # /MTd
-              }],
-            ],
-          },
-          'VCLinkerTool': {
-            'LinkIncremental': '2',
-          },
-        },
-        'variables': {
-          'v8_enable_slow_dchecks%': 1,
-        },
-        'conditions': [
-          ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
-            OS=="qnx" or OS=="aix"', {
-            'cflags!': [
-              '-O3',
-              '-O2',
-              '-O1',
-              '-Os',
-            ],
-            'cflags': [
-              '-fdata-sections',
-              '-ffunction-sections',
-            ],
-          }],
-          ['OS=="mac"', {
-            'xcode_settings': {
-               'GCC_OPTIMIZATION_LEVEL': '0',  # -O0
-            },
-          }],
-          ['v8_enable_slow_dchecks==1', {
-            'defines': [
-              'ENABLE_SLOW_DCHECKS',
-            ],
-          }],
-        ],
-      },  # DebugBase0
-      # Abstract configuration for v8_optimized_debug == 1.
-      'DebugBase1': {
-        'abstract': 1,
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'Optimization': '2',
-            'InlineFunctionExpansion': '2',
-            'EnableIntrinsicFunctions': 'true',
-            'FavorSizeOrSpeed': '0',
-            'StringPooling': 'true',
-            'BasicRuntimeChecks': '0',
-            'conditions': [
-              ['component=="shared_library" or force_dynamic_crt==1', {
-                'RuntimeLibrary': '3',  #/MDd
-              }, {
-                'RuntimeLibrary': '1',  #/MTd
-              }],
-            ],
-          },
-          'VCLinkerTool': {
-            'LinkIncremental': '1',
-            'OptimizeReferences': '2',
-            'EnableCOMDATFolding': '2',
-          },
-        },
-        'variables': {
-          'v8_enable_slow_dchecks%': 0,
-        },
-        'conditions': [
-          ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
-            OS=="qnx" or OS=="aix"', {
-            'cflags!': [
-              '-O0',
-              '-O1',
-              '-Os',
-            ],
-            'cflags': [
-              '-fdata-sections',
-              '-ffunction-sections',
-            ],
-            'conditions': [
-              # Don't use -O3 with sanitizers.
-              ['asan==0 and msan==0 and lsan==0 \
-                and tsan==0 and ubsan==0 and ubsan_vptr==0', {
-                'cflags': ['-O3'],
-                'cflags!': ['-O2'],
-                }, {
-                'cflags': ['-O2'],
-                'cflags!': ['-O3'],
-              }],
-            ],
-          }],
-          ['OS=="mac"', {
-            'xcode_settings': {
-              'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
-              'GCC_STRICT_ALIASING': 'YES',
-            },
-          }],
-          ['v8_enable_slow_dchecks==1', {
-            'defines': [
-              'ENABLE_SLOW_DCHECKS',
-            ],
-          }],
-        ],
-      },  # DebugBase1
-      # Common settings for the Debug configuration.
-      'DebugBaseCommon': {
-        'abstract': 1,
+      'Debug': {
         'defines': [
           'ENABLE_DISASSEMBLER',
           'V8_ENABLE_CHECKS',
@@ -1311,27 +1197,126 @@
               }],
             ],
           }],
-        ],
-      },  # DebugBaseCommon
-      'Debug': {
-        'inherit_from': ['DebugBaseCommon'],
-        'conditions': [
           ['v8_optimized_debug==0', {
-            'inherit_from': ['DebugBase0'],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'Optimization': '0',
+                'conditions': [
+                  ['component=="shared_library" or force_dynamic_crt==1', {
+                    'RuntimeLibrary': '3',  # /MDd
+                  }, {
+                     'RuntimeLibrary': '1',  # /MTd
+                   }],
+                ],
+              },
+              'VCLinkerTool': {
+                'LinkIncremental': '2',
+              },
+            },
+            'variables': {
+              'v8_enable_slow_dchecks%': 1,
+            },
+            'conditions': [
+              ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
+            OS=="qnx" or OS=="aix"', {
+                'cflags!': [
+                  '-O3',
+                  '-O2',
+                  '-O1',
+                  '-Os',
+                ],
+                'cflags': [
+                  '-fdata-sections',
+                  '-ffunction-sections',
+                ],
+              }],
+              ['OS=="mac"', {
+                'xcode_settings': {
+                  'GCC_OPTIMIZATION_LEVEL': '0',  # -O0
+                },
+              }],
+              ['v8_enable_slow_dchecks==1', {
+                'defines': [
+                  'ENABLE_SLOW_DCHECKS',
+                ],
+              }],
+            ],
           }, {
-            'inherit_from': ['DebugBase1'],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'Optimization': '2',
+                'InlineFunctionExpansion': '2',
+                'EnableIntrinsicFunctions': 'true',
+                'FavorSizeOrSpeed': '0',
+                'StringPooling': 'true',
+                'BasicRuntimeChecks': '0',
+                'conditions': [
+                  ['component=="shared_library" or force_dynamic_crt==1', {
+                    'RuntimeLibrary': '3',  #/MDd
+                  }, {
+                     'RuntimeLibrary': '1',  #/MTd
+                   }],
+                ],
+              },
+              'VCLinkerTool': {
+                'LinkIncremental': '1',
+                'OptimizeReferences': '2',
+                'EnableCOMDATFolding': '2',
+              },
+            },
+            'variables': {
+              'v8_enable_slow_dchecks%': 0,
+            },
+            'conditions': [
+              ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
+            OS=="qnx" or OS=="aix"', {
+                'cflags!': [
+                  '-O0',
+                  '-O1',
+                  '-Os',
+                ],
+                'cflags': [
+                  '-fdata-sections',
+                  '-ffunction-sections',
+                ],
+                'conditions': [
+                  # Don't use -O3 with sanitizers.
+                  ['asan==0 and msan==0 and lsan==0 \
+                and tsan==0 and ubsan==0 and ubsan_vptr==0', {
+                    'cflags': ['-O3'],
+                    'cflags!': ['-O2'],
+                  }, {
+                     'cflags': ['-O2'],
+                     'cflags!': ['-O3'],
+                   }],
+                ],
+              }],
+              ['OS=="mac"', {
+                'xcode_settings': {
+                  'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
+                  'GCC_STRICT_ALIASING': 'YES',
+                },
+              }],
+              ['v8_enable_slow_dchecks==1', {
+                'defines': [
+                  'ENABLE_SLOW_DCHECKS',
+                ],
+              }],
+            ],
           }],
           # Temporary refs: https://github.com/nodejs/node/pull/23801
           ['v8_enable_handle_zapping==1', {
             'defines': ['ENABLE_HANDLE_ZAPPING',],
           }],
         ],
-      },  # Debug
-      'ReleaseBase': {
-        'abstract': 1,
+
+      },  # DebugBaseCommon
+      'Release': {
         'variables': {
           'v8_enable_slow_dchecks%': 0,
         },
+         # Temporary refs: https://github.com/nodejs/node/pull/23801
+        'defines!': ['ENABLE_HANDLE_ZAPPING',],
         'conditions': [
           ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
             or OS=="aix"', {
@@ -1407,29 +1392,6 @@
           }],
         ],  # conditions
       },  # Release
-      'Release': {
-        'inherit_from': ['ReleaseBase'],
-        # Temporary refs: https://github.com/nodejs/node/pull/23801
-        'defines!': ['ENABLE_HANDLE_ZAPPING',],
-      },  # Debug
-      'conditions': [
-        [ 'OS=="win"', {
-          # TODO(bradnelson): add a gyp mechanism to make this more graceful.
-          'Debug_x64': {
-            'inherit_from': ['DebugBaseCommon'],
-            'conditions': [
-              ['v8_optimized_debug==0', {
-                'inherit_from': ['DebugBase0'],
-              }, {
-                'inherit_from': ['DebugBase1'],
-              }],
-            ],
-          },
-          'Release_x64': {
-            'inherit_from': ['ReleaseBase'],
-          },
-        }],
-      ],
     },  # configurations
     'msvs_disabled_warnings': [
       4245,  # Conversion with signed/unsigned mismatch.
diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
index f47cf075bb..0c257025ca 100644
--- a/deps/v8/gypfiles/v8.gyp
+++ b/deps/v8/gypfiles/v8.gyp
@@ -2539,23 +2539,10 @@
         '_HAS_EXCEPTIONS=0',
         'BUILDING_V8_SHARED=1',
       ],
-      # This is defined trough `configurations` for GYP+ninja compatibility
-      'configurations': {
-        'Debug': {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'RuntimeTypeInfo': 'true',
-              'ExceptionHandling': 1,
-            },
-          }
-        },
-        'Release': {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'RuntimeTypeInfo': 'true',
-              'ExceptionHandling': 1,
-            },
-          }
+      'msvs_settings': {
+        'VCCLCompilerTool': {
+          'RuntimeTypeInfo': 'true',
+          'ExceptionHandling': 1,
         },
       },
       'sources': [