From 0a346fc2645ba3cd02c0e85647fb6f4623c5bd00 Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Fri, 29 Sep 2017 10:19:29 +0200 Subject: [PATCH] Reland "[build] Switch windows default compilation to MSVS 2017" This is a reland of a0d2ffb661597f4082a79185b799e7c7065ed32a This also relands: https://chromium-review.googlesource.com/c/v8/v8/+/684215 Original change's description: > [build] Switch windows default compilation to MSVS 2017 > > Bug: v8:6857 > Change-Id: Icab007681753c6f8143147ea8b2c1b06bf325d92 > Reviewed-on: https://chromium-review.googlesource.com/686900 > Commit-Queue: Michael Achenbach > Reviewed-by: Sergiy Byelozyorov > Cr-Commit-Position: refs/heads/master@{#48196} TBR=sergiyb@chromium.org Bug: v8:6857 Change-Id: I7e8f560dbb4fcf4f937f8494fb01c802201cf236 Reviewed-on: https://chromium-review.googlesource.com/691834 Reviewed-by: Michael Achenbach Reviewed-by: Sergiy Byelozyorov Commit-Queue: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#48221} --- DEPS | 8 ++++---- gni/isolate.gni | 2 +- gypfiles/win/msvs_dependencies.isolate | 8 ++++---- test/webkit/webkit.status | 4 ++++ tools/mb/mb.py | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/DEPS b/DEPS index 7e2996da2a..e8b4e878f5 100644 --- a/DEPS +++ b/DEPS @@ -8,7 +8,7 @@ vars = { deps = { "v8/build": - Var("chromium_url") + "/chromium/src/build.git" + "@" + "898597f665820182fc979b13c1b2e6de06a608c4", + Var("chromium_url") + "/chromium/src/build.git" + "@" + "57716b379e9bbe0b7b6792046a3dd387001e1643", "v8/tools/gyp": Var("chromium_url") + "/external/gyp.git" + "@" + "d61a9397e668fa9843c4aa7da9e79460fe590bfb", "v8/third_party/icu": @@ -16,7 +16,7 @@ deps = { "v8/third_party/instrumented_libraries": Var("chromium_url") + "/chromium/src/third_party/instrumented_libraries.git" + "@" + "644afd349826cb68204226a16c38bde13abe9c3c", "v8/buildtools": - Var("chromium_url") + "/chromium/buildtools.git" + "@" + "cbc33b9c0a9d1bb913895a4319a742c504a2d541", + Var("chromium_url") + "/chromium/buildtools.git" + "@" + "f6d165d9d842ddd29056c127a5f3a3c5d8e0d2e3", "v8/base/trace_event/common": Var("chromium_url") + "/chromium/src/base/trace_event/common.git" + "@" + "65d1d42a5df6c0a563a6fdfa58a135679185e5d9", "v8/third_party/jinja2": @@ -38,7 +38,7 @@ deps = { "v8/test/test262/harness": Var("chromium_url") + "/external/github.com/test262-utils/test262-harness-py.git" + "@" + "0f2acdd882c84cff43b9d60df7574a1901e2cdcd", "v8/tools/clang": - Var("chromium_url") + "/chromium/src/tools/clang.git" + "@" + "cf5e2ed6a9fe35e792587a111a4b2a515deff772", + Var("chromium_url") + "/chromium/src/tools/clang.git" + "@" + "66be66dcb7169e736d56d6fc2b53a7d6dac87ac4", "v8/test/wasm-js": Var("chromium_url") + "/external/github.com/WebAssembly/spec.git" + "@" + "4f1d3114157e6459d8a06e7d8fcc8fc90288cd85", } @@ -48,7 +48,7 @@ deps_os = { "v8/third_party/android_tools": Var("chromium_url") + "/android_tools.git" + "@" + "aadb2fed04af8606545b0afe4e3060bc1a15fad7", "v8/third_party/catapult": - Var('chromium_url') + "/external/github.com/catapult-project/catapult.git" + "@" + "e3fe21f5029c7d2cd2a83f012375ea9d877733d5", + Var('chromium_url') + "/external/github.com/catapult-project/catapult.git" + "@" + "9a255f51046c55ea3c209acd64e36d8a5bd46fa4", }, } diff --git a/gni/isolate.gni b/gni/isolate.gni index 82dc8cf3fb..4b0ffdc413 100644 --- a/gni/isolate.gni +++ b/gni/isolate.gni @@ -178,7 +178,7 @@ template("v8_isolate_run") { if (is_win) { args += [ "--config-variable", - "msvs_version=2015", + "msvs_version=2017", ] } else { args += [ diff --git a/gypfiles/win/msvs_dependencies.isolate b/gypfiles/win/msvs_dependencies.isolate index 79ae11a1ae..2859126659 100644 --- a/gypfiles/win/msvs_dependencies.isolate +++ b/gypfiles/win/msvs_dependencies.isolate @@ -25,8 +25,8 @@ ], }, }], - # VS2015 runtimes - ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { + # VS2015/2017 runtimes + ['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { 'variables': { 'files': [ '<(PRODUCT_DIR)/msvcp140d.dll', @@ -36,7 +36,7 @@ ], }, }], - ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', { + ['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', { 'variables': { 'files': [ '<(PRODUCT_DIR)/msvcp140.dll', @@ -46,7 +46,7 @@ ], }, }], - ['OS=="win" and msvs_version==2015 and component=="shared_library"', { + ['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library"', { # Windows 10 Universal C Runtime binaries. 'variables': { 'files': [ diff --git a/test/webkit/webkit.status b/test/webkit/webkit.status index e8a24abd50..322454ba17 100644 --- a/test/webkit/webkit.status +++ b/test/webkit/webkit.status @@ -36,6 +36,10 @@ # Irregexp interpreter overflows stack. We should just not crash. 'fast/js/regexp-stack-overflow': [PASS, FAIL], }], # ALWAYS +['system == windows', { + # Exceeds call stack on windows after MSVS2017 switch. + 'fast/js/excessive-comma-usage': [SKIP], +}], # system == windows ['mode == debug', { # Too slow in debug mode. 'dfg-int-overflow-in-loop': [SKIP], diff --git a/tools/mb/mb.py b/tools/mb/mb.py index b37c9dde7d..86a5e575fd 100755 --- a/tools/mb/mb.py +++ b/tools/mb/mb.py @@ -781,7 +781,7 @@ class MetaBuildWrapper(object): # TODO(machenbach): Remove after GYP_MSVS_VERSION is removed on infra side. env = {} env.update(os.environ) - env['GYP_MSVS_VERSION'] = '2015' + env['GYP_MSVS_VERSION'] = '2017' ret, _, _ = self.Run(cmd, env=env) if ret: