[V8, icu] Update v8 to version 9.0.257.17, icu to 69.1 (#16077)

This change also includes a change to use the Windows SDK as reported by the WinSDK ENV variable. v8 9.0257.17 requires ICU to be version 68.x or up.
2024-12-27 10:21:07 +08:00 · 2021-04-19 18:15:39 -06:00 · 2021-04-19 18:15:39 -06:00 · 66ce4e9277
commit 66ce4e9277
parent 465022c4bd
12 changed files with 132 additions and 206 deletions
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@ -1,5 +1,5 @@
 Source: icu
-Version: 67.1
+Version: 69.1
 Port-Version: 8
 Homepage: http://icu-project.org/apiref/icu4c/
 Description: Mature and widely used Unicode and localization library.
--- a/ports/icu/fix_parallel_build_on_windows.patch
+++ b/ports/icu/fix_parallel_build_on_windows.patch
@ -1,7 +1,7 @@
 diff --urN a/source/data/Makefile.in b/source/data/Makefile.in
 --- a/source/data/Makefile.in
 +++ b/source/data/Makefile.in
-@@ -221,11 +221,12 @@
+@@ -236,11 +236,12 @@
 ## Include the main build rules for data files
 include $(top_builddir)/$(subdir)/rules.mk
 
@ -10,12 +10,12 @@ diff --urN a/source/data/Makefile.in b/source/data/Makefile.in
 ifeq ($(ENABLE_SO_VERSION_DATA),1)
 ifeq ($(PKGDATA_MODE),dll)
 SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
-$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
+-$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | $(TMP_DIR)/dirs.timestamp
 +$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc $(PKGDATA_LIST)
 ifeq ($(MSYS_RC_MODE),1)
 	rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
 else
-@@ -234,7 +235,6 @@
+@@ -249,7 +250,6 @@
 endif
 endif
 
--- a/ports/icu/mingw-remove-bsymbolic.patch
+++ b/ports/icu/mingw-remove-bsymbolic.patch
@ -1,26 +0,0 @@
-diff --git a/source/config/mh-mingw b/source/config/mh-mingw
-index a28e47b..7d77ec0 100644
--- a/source/config/mh-mingw
-+++ b/source/config/mh-mingw
-@@ -57,7 +57,7 @@ LINK.c=       $(CXX) $(CXXFLAGS) $(LDFLAGS)
- #LINK.cc=      $(CXX) $(CXXFLAGS) $(LDFLAGS)
- 
- ## Shared library options
-LD_SOOPTIONS= -Wl,-Bsymbolic
-+LD_SOOPTIONS=
- 
- ## Commands to make a shared library
- SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
-diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64
-index afe2c0e..ca0b8d4 100644
--- a/source/config/mh-mingw64
-+++ b/source/config/mh-mingw64
-@@ -57,7 +57,7 @@ LINK.c=       $(CXX) $(CXXFLAGS) $(LDFLAGS)
- #LINK.cc=      $(CXX) $(CXXFLAGS) $(LDFLAGS)
- 
- ## Shared library options
-LD_SOOPTIONS= -Wl,-Bsymbolic
-+LD_SOOPTIONS=
- 
- ## Commands to make a shared library
- SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
--- a/ports/icu/mingw-remove-version-from-link-flags.patch
+++ b/ports/icu/mingw-remove-version-from-link-flags.patch
@ -1,48 +0,0 @@
-diff --git a/source/config/mh-mingw b/source/config/mh-mingw
-index 7d77ec0..30f6e5b 100644
--- a/source/config/mh-mingw
-+++ b/source/config/mh-mingw
-@@ -101,11 +101,14 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
- #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
- #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
- 
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-+#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)"
- #SH#
- #SH## ICULIBS is the set of libraries your application should link
- #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 
-diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64
-index ca0b8d4..fb64c56 100644
--- a/source/config/mh-mingw64
-+++ b/source/config/mh-mingw64
-@@ -101,11 +101,14 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
- #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
- #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
- 
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-+#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)"
-+ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)"
- #SH#
- #SH## ICULIBS is the set of libraries your application should link
- #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@ -1,6 +1,6 @@
 vcpkg_fail_port_install(ON_TARGET "uwp")

-set(ICU_VERSION_MAJOR 67)
+set(ICU_VERSION_MAJOR 69)
 set(ICU_VERSION_MINOR 1)
 set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")
 set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")
@ -10,7 +10,7 @@ vcpkg_download_distfile(
    ARCHIVE
    URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
    FILENAME "icu4c-${VERSION2}-src.tgz"
-    SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
+    SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 
 )
 vcpkg_extract_source_archive_ex(
    OUT_SOURCE_PATH SOURCE_PATH
@ -20,8 +20,6 @@ vcpkg_extract_source_archive_ex(
        ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch
        ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch
        ${CMAKE_CURRENT_LIST_DIR}/fix-extra.patch
-        ${CMAKE_CURRENT_LIST_DIR}/mingw-remove-bsymbolic.patch
-        ${CMAKE_CURRENT_LIST_DIR}/mingw-remove-version-from-link-flags.patch
 )

 vcpkg_find_acquire_program(PYTHON3)
--- a/ports/v8/CONTROL
+++ b/ports/v8/CONTROL
@ -1,5 +1,5 @@
 Source: v8
-Version: 8.6.395.17
+Version: 9.0.257.17
 Homepage: https://v8.dev
 Description: Google Chrome's JavaScript engine
 Build-Depends: icu, zlib, glib (linux), pthread (linux)
--- a/ports/v8/build.patch
+++ b/ports/v8/build.patch
@ -1,16 +1,8 @@
 diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
-index 82474eee8..4b22319e3 100644
+index 0c8743726..e6a5ae0b4 100644
 --- a/config/compiler/BUILD.gn
 +++ b/config/compiler/BUILD.gn
-@@ -12,7 +12,6 @@ import("//build/config/clang/clang.gni")
- import("//build/config/compiler/compiler.gni")
- import("//build/config/coverage/coverage.gni")
- import("//build/config/dcheck_always_on.gni")
-import("//build/config/gclient_args.gni")
- import("//build/config/host_byteorder.gni")
- import("//build/config/sanitizers/sanitizers.gni")
- import("//build/config/ui.gni")
-@@ -1501,6 +1500,7 @@ config("default_warnings") {
+@@ -1545,6 +1545,7 @@ config("default_warnings") {
       # Disables.
       "-Wno-missing-field-initializers",  # "struct foo f = {0};"
       "-Wno-unused-parameter",  # Unused function parameters.
@ -18,7 +10,7 @@ index 82474eee8..4b22319e3 100644
     ]
   }

-@@ -1924,8 +1924,17 @@ config("no_incompatible_pointer_warnings") {
+@@ -1969,8 +1970,17 @@ config("no_incompatible_pointer_warnings") {
 # Shared settings for both "optimize" and "optimize_max" configs.
 # IMPORTANT: On Windows "/O1" and "/O2" must go before the common flags.
 if (is_win) {
@ -177,32 +169,6 @@ index 428e44ac0..a0d2175ee 100644
 template("pkg_config") {
   assert(defined(invoker.packages),
          "Variable |packages| must be defined to be a list in pkg_config.")
-diff --git a/toolchain/win/tool_wrapper.py b/toolchain/win/tool_wrapper.py
-index 18986986c..cf409216c 100644
--- a/toolchain/win/tool_wrapper.py
-+++ b/toolchain/win/tool_wrapper.py
-@@ -141,9 +141,9 @@ class WinTool(object):
-     # Read output one line at a time as it shows up to avoid OOM failures when
-     # GBs of output is produced.
-     for line in link.stdout:
-      if (not line.startswith('   Creating library ') and
-          not line.startswith('Generating code') and
-          not line.startswith('Finished generating code')):
-+      if (not line.startswith(b'   Creating library ') and
-+          not line.startswith(b'Generating code') and
-+          not line.startswith(b'Finished generating code')):
-         print(line)
-     return link.wait()
-
-@@ -159,7 +159,7 @@ class WinTool(object):
-                              stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-     out, _ = popen.communicate()
-     for line in out.splitlines():
-      if not line.startswith(' Assembling: '):
-+      if not line.startswith(b' Assembling: '):
-         print(line)
-     return popen.returncode
-
 diff --git a/util/lastchange.py b/util/lastchange.py
 index 874870ad5..a4fc0be8d 100644
 --- a/util/lastchange.py
--- a/ports/v8/portfile.cmake
+++ b/ports/v8/portfile.cmake
@ -1,5 +1,5 @@

-set(pkgver "8.6.395.17")
+set(pkgver "9.0.257.17")

 set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0)

@ -71,7 +71,7 @@ endfunction()
 vcpkg_from_git(
    OUT_SOURCE_PATH SOURCE_PATH
    URL https://chromium.googlesource.com/v8/v8.git
-    REF 7565e93eb72cea4268028fc20186d415c22b1cff
+    REF 462fc27a2892702a4d42ffd647789c58ffcee747
    PATCHES ${CURRENT_PORT_DIR}/v8.patch
 )

@ -79,7 +79,7 @@ message(STATUS "Fetching submodules")
 v8_fetch(
        DESTINATION build
        URL https://chromium.googlesource.com/chromium/src/build.git
-        REF b6be94885f567b15bcb0961298b32cdb737ae2d6
+        REF acacc4cc0668cb4dc7f44a3f4430635f438d7478 
        SOURCE ${SOURCE_PATH}
        PATCHES ${CURRENT_PORT_DIR}/build.patch)
 v8_fetch(
@ -117,6 +117,11 @@ vcpkg_execute_required_process(
 file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/icu")
 configure_file(${CURRENT_PORT_DIR}/zlib.gn ${SOURCE_PATH}/third_party/zlib/BUILD.gn COPYONLY)
 configure_file(${CURRENT_PORT_DIR}/icu.gn ${SOURCE_PATH}/third_party/icu/BUILD.gn COPYONLY)
+file(WRITE ${SOURCE_PATH}/build/config/gclient_args.gni "checkout_google_benchmark = false\n")
+if(WIN32)
+	string(REGEX REPLACE "\\\\+$" "" WindowsSdkDir $ENV{WindowsSdkDir})
+	file(APPEND ${SOURCE_PATH}/build/config/gclient_args.gni "windows_sdk_path = \"${WindowsSdkDir}\"\n")
+endif()

 if(UNIX)
    set(UNIX_CURRENT_INSTALLED_DIR ${CURRENT_INSTALLED_DIR})
--- a/ports/v8/v8.patch
+++ b/ports/v8/v8.patch
@ -1,42 +1,33 @@
-diff --git a/gni/v8.gni b/gni/v8.gni
-index 413b0d3810..8c17353120 100644
--- a/gni/v8.gni
-+++ b/gni/v8.gni
-@@ -2,7 +2,6 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
+diff --git a/BUILD.gn b/BUILD.gn
+index a9ab6783fa..bc8455ce64 100644
+--- a/BUILD.gn
+++ b/BUILD.gn
+@@ -5202,6 +5202,7 @@ if (is_component_build) {

-import("//build/config/gclient_args.gni")
- import("//build/config/sanitizers/sanitizers.gni")
- import("//build/config/v8_target_cpu.gni")
- import("split_static_library.gni")
-@@ -67,7 +66,7 @@ declare_args() {
-   # Add fuzzilli fuzzer support.
-   v8_fuzzilli = false
-
-  v8_enable_google_benchmark = checkout_google_benchmark
-+  v8_enable_google_benchmark = false
- }
-
- if (v8_use_external_startup_data == "") {
-diff --git a/include/v8-cppgc.h b/include/v8-cppgc.h
-index e202293bcf..317bac7f17 100644
--- a/include/v8-cppgc.h
-+++ b/include/v8-cppgc.h
-@@ -90,7 +90,7 @@ void JSMemberBase::Reset() {
-  * method.
-  */
- template <typename T>
-class V8_EXPORT JSMember : public internal::JSMemberBase {
-+class JSMember : public internal::JSMemberBase {
-   static_assert(std::is_base_of<v8::Value, T>::value,
-                 "JSMember only supports references to v8::Value");
+     public_deps = [
+       ":v8_base",
+      ":v8_initializers",
+       ":v8_snapshot",
+     ]

+diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
+index 03af2cc5e2..bb19092c54 100644
+--- a/src/codegen/code-stub-assembler.h
+++ b/src/codegen/code-stub-assembler.h
+@@ -301,7 +301,7 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol };
+ // it's possible to add JavaScript-specific useful CodeAssembler "macros"
+ // without modifying files in the compiler directory (and requiring a review
+ // from a compiler directory OWNER).
+-class V8_EXPORT_PRIVATE CodeStubAssembler
+class V8_EXPORT CodeStubAssembler
+     : public compiler::CodeAssembler,
+       public TorqueGeneratedExportedMacrosAssembler {
+  public:
 diff --git a/src/common/globals.h b/src/common/globals.h
-index dbc6b9af9b..7634fc1a08 100644
+index d9d502aa51..7495c898fc 100644
 --- a/src/common/globals.h
 +++ b/src/common/globals.h
-@@ -1356,7 +1356,7 @@ class BinaryOperationFeedback {
+@@ -1348,7 +1348,7 @@ class BinaryOperationFeedback {
 // This is distinct from BinaryOperationFeedback on purpose, because the
 // feedback that matters differs greatly as well as the way it is consumed.
 class CompareOperationFeedback {
@ -45,7 +36,7 @@ index dbc6b9af9b..7634fc1a08 100644
     kSignedSmallFlag = 1 << 0,
     kOtherNumberFlag = 1 << 1,
     kBooleanFlag = 1 << 2,
-@@ -1370,7 +1370,7 @@ class CompareOperationFeedback {
+@@ -1362,7 +1362,7 @@ class CompareOperationFeedback {
   };

  public:
@ -55,7 +46,7 @@ index dbc6b9af9b..7634fc1a08 100644

     kBoolean = kBooleanFlag,
 diff --git a/src/compiler/node-cache.h b/src/compiler/node-cache.h
-index 935e5778e3..d5dae22512 100644
+index 8e1d3d4eae..c55d8329de 100644
 --- a/src/compiler/node-cache.h
 +++ b/src/compiler/node-cache.h
@@ -29,7 +29,7 @@ class Node;
@ -81,7 +72,7 @@ index e135e30efc..0c055247bc 100644
     HeapObject next_obj = FromCurrentPage();
     if (!next_obj.is_null()) return next_obj;
 diff --git a/src/heap/paged-spaces.h b/src/heap/paged-spaces.h
-index 4af1b3013c..2489ad6a35 100644
+index 5168f0f053..ae5c22d1f3 100644
 --- a/src/heap/paged-spaces.h
 +++ b/src/heap/paged-spaces.h
@@ -45,7 +45,7 @@ class V8_EXPORT_PRIVATE PagedSpaceObjectIterator : public ObjectIterator {
@ -94,10 +85,10 @@ index 4af1b3013c..2489ad6a35 100644
  private:
   // Fast (inlined) path of next().
 diff --git a/src/objects/feedback-vector.cc b/src/objects/feedback-vector.cc
-index cf1712b0f0..73eb5c0ec7 100644
+index a77ea5d265..0cddb92a02 100644
 --- a/src/objects/feedback-vector.cc
 +++ b/src/objects/feedback-vector.cc
-@@ -115,9 +115,9 @@ Handle<FeedbackMetadata> FeedbackMetadata::New(LocalIsolate* isolate,
+@@ -114,9 +114,9 @@ Handle<FeedbackMetadata> FeedbackMetadata::New(LocalIsolate* isolate,
   return metadata;
 }

@ -110,7 +101,7 @@ index cf1712b0f0..73eb5c0ec7 100644

 bool FeedbackMetadata::SpecDiffersFrom(
 diff --git a/src/objects/fixed-array-inl.h b/src/objects/fixed-array-inl.h
-index f6c52b8ed0..94f81d3e7d 100644
+index a91f89784f..5ecf7e3372 100644
 --- a/src/objects/fixed-array-inl.h
 +++ b/src/objects/fixed-array-inl.h
@@ -88,7 +88,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) {
@ -123,10 +114,10 @@ index f6c52b8ed0..94f81d3e7d 100644
   DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));
   DCHECK(Object(value).IsSmi());
 diff --git a/src/objects/fixed-array.h b/src/objects/fixed-array.h
-index fea05b4001..90659c3867 100644
+index 53b4cbb22b..8dd24df399 100644
 --- a/src/objects/fixed-array.h
 +++ b/src/objects/fixed-array.h
-@@ -122,7 +122,7 @@ class FixedArray
+@@ -130,7 +130,7 @@ class FixedArray
   inline bool is_the_hole(Isolate* isolate, int index);

   // Setter that doesn't need write barrier.
@ -135,21 +126,21 @@ index fea05b4001..90659c3867 100644
   // Setter with explicit barrier mode.
   inline void set(int index, Object value, WriteBarrierMode mode);

-diff --git a/src/objects/string.h b/src/objects/string.h
-index 0b7bd55aee..c7fa7f49d9 100644
--- a/src/objects/string.h
-+++ b/src/objects/string.h
-@@ -293,7 +293,7 @@ class String : public TorqueGeneratedString<String, Name> {
+diff --git a/src/runtime/runtime-wasm.cc b/src/runtime/runtime-wasm.cc
+index 9ba26c23ad..5857bf4c39 100644
+--- a/src/runtime/runtime-wasm.cc
+++ b/src/runtime/runtime-wasm.cc
+@@ -570,7 +570,7 @@ RUNTIME_FUNCTION(Runtime_WasmDebugBreak) {
+   DebugScope debug_scope(isolate->debug());

-   V8_EXPORT_PRIVATE bool HasOneBytePrefix(Vector<const char> str);
-   V8_EXPORT_PRIVATE bool IsOneByteEqualTo(Vector<const uint8_t> str);
-  V8_EXPORT_PRIVATE bool IsOneByteEqualTo(Vector<const char> str) {
-+  inline bool IsOneByteEqualTo(Vector<const char> str) {
-     return IsOneByteEqualTo(Vector<const uint8_t>::cast(str));
-   }
-   bool IsTwoByteEqualTo(Vector<const uc16> str);
+   // Check for instrumentation breakpoint.
+-  DCHECK_EQ(script->break_on_entry(), instance->break_on_entry());
+  DCHECK_EQ(script->break_on_entry(), static_cast<bool>(instance->break_on_entry()));
+   if (script->break_on_entry()) {
+     MaybeHandle<FixedArray> maybe_on_entry_breakpoints =
+         WasmScript::CheckBreakPoints(
 diff --git a/src/snapshot/snapshot-utils.cc b/src/snapshot/snapshot-utils.cc
-index 319b828446..64c974fcd8 100644
+index eb2372372c..7defadb4b1 100644
 --- a/src/snapshot/snapshot-utils.cc
 +++ b/src/snapshot/snapshot-utils.cc
@@ -5,7 +5,7 @@
@ -162,10 +153,10 @@ index 319b828446..64c974fcd8 100644
 namespace v8 {
 namespace internal {
 diff --git a/src/wasm/function-body-decoder-impl.h b/src/wasm/function-body-decoder-impl.h
-index cb54e46d64..e12336950a 100644
+index 6c9700b100..e3be3c31f5 100644
 --- a/src/wasm/function-body-decoder-impl.h
 +++ b/src/wasm/function-body-decoder-impl.h
-@@ -1748,7 +1748,7 @@ class WasmDecoder : public Decoder {
+@@ -2006,7 +2006,7 @@ class WasmDecoder : public Decoder {
   }

   // TODO(clemensb): This is only used by the interpreter; move there.
@ -174,23 +165,11 @@ index cb54e46d64..e12336950a 100644
     WasmOpcode opcode = static_cast<WasmOpcode>(*pc);
     // Handle "simple" opcodes with a fixed signature first.
     const FunctionSig* sig = WasmOpcodes::Signature(opcode);
-diff --git a/src/wasm/wasm-module-builder.h b/src/wasm/wasm-module-builder.h
-index 309d4bbb9f..1390d422a1 100644
--- a/src/wasm/wasm-module-builder.h
-+++ b/src/wasm/wasm-module-builder.h
-@@ -361,6 +361,7 @@ class V8_EXPORT_PRIVATE WasmModuleBuilder : public ZoneObject {
-   // Indirect functions must be allocated before adding extra tables.
-   bool allocating_indirect_functions_allowed_ = true;
- #endif
-+  DISALLOW_COPY_AND_ASSIGN(WasmModuleBuilder);
- };
-
- inline FunctionSig* WasmFunctionBuilder::signature() {
 diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn
-index 35a22344fb..01a77268cc 100644
+index e63fe5ed35..ec48403c42 100644
 --- a/test/cctest/BUILD.gn
 +++ b/test/cctest/BUILD.gn
-@@ -444,6 +444,10 @@ v8_source_set("cctest_sources") {
+@@ -480,6 +480,10 @@ v8_source_set("cctest_sources") {
     # C4309: 'static_cast': truncation of constant value
     cflags += [ "/wd4309" ]

@ -202,13 +181,13 @@ index 35a22344fb..01a77268cc 100644
     cflags += [ "/bigobj" ]

 diff --git a/tools/debug_helper/BUILD.gn b/tools/debug_helper/BUILD.gn
-index 522a0e2270..bbe5809baa 100644
+index 54cd3b7a4c..9c6666871d 100644
 --- a/tools/debug_helper/BUILD.gn
 +++ b/tools/debug_helper/BUILD.gn
-@@ -92,10 +92,12 @@ v8_component("v8_debug_helper") {
-     "../..:run_torque",
-     "../..:v8_headers",
+@@ -99,10 +99,12 @@ v8_component("v8_debug_helper") {
     "../..:v8_libbase",
+     "../..:v8_shared_internal_headers",
+     "../..:v8_tracing",
 +    "../..:v8",
   ]

@ -231,3 +210,45 @@ index 10d06a127f..d0deb7adca 100644

   include_dirs = [ "../.." ]
 }
+diff --git a/tools/v8windbg/base/dbgext.h b/tools/v8windbg/base/dbgext.h
+index 8b36a8f361..f8d9f0d64e 100644
+--- a/tools/v8windbg/base/dbgext.h
+++ b/tools/v8windbg/base/dbgext.h
+@@ -9,6 +9,7 @@
+ #error Unicode not defined
+ #endif
+
+#include <new>
+ #include <DbgEng.h>
+ #include <DbgModel.h>
+ #include <Windows.h>
+diff --git a/tools/v8windbg/src/v8-debug-helper-interop.h b/tools/v8windbg/src/v8-debug-helper-interop.h
+index f7d78c5dd3..1c70e54e7a 100644
+--- a/tools/v8windbg/src/v8-debug-helper-interop.h
+++ b/tools/v8windbg/src/v8-debug-helper-interop.h
+@@ -5,10 +5,11 @@
+ #ifndef V8_TOOLS_V8WINDBG_SRC_V8_DEBUG_HELPER_INTEROP_H_
+ #define V8_TOOLS_V8WINDBG_SRC_V8_DEBUG_HELPER_INTEROP_H_
+
+-#include <wrl/client.h>
+-
+#include <new>
+#include <DbgEng.h>
+ #include <DbgModel.h>
+
+#include <wrl/client.h>
+ #include <cstdint>
+ #include <map>
+ #include <string>
+diff --git a/tools/v8windbg/test/debug-callbacks.h b/tools/v8windbg/test/debug-callbacks.h
+index 8855d6ffbc..ed2b0f62e9 100644
+--- a/tools/v8windbg/test/debug-callbacks.h
+++ b/tools/v8windbg/test/debug-callbacks.h
+@@ -9,6 +9,7 @@
+ #error Unicode not defined
+ #endif
+
+#include <new>
+ #include <DbgEng.h>
+ #include <DbgModel.h>
+ #include <Windows.h>
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2493,7 +2493,7 @@
      "port-version": 0
    },
    "icu": {
-      "baseline": "67.1",
+      "baseline": "69.1",
      "port-version": 8
    },
    "ideviceinstaller": {
@ -6257,7 +6257,7 @@
      "port-version": 1
    },
    "v8": {
-      "baseline": "8.6.395.17",
+      "baseline": "9.0.257.17",
      "port-version": 0
    },
    "valijson": {
--- a/versions/i-/icu.json
+++ b/versions/i-/icu.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c918e5cfffd2c55c740dd69ef3f5eb36c1e17806",
+      "version-string": "69.1",
+      "port-version": 8
+    },
    {
      "git-tree": "db2977707d68a8c04e0960b0965722f8e5bfda20",
      "version-string": "67.1",
--- a/versions/v-/v8.json
+++ b/versions/v-/v8.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "6c755ec3da82205827403e58b0dbaa1549334a3a",
+      "version-string": "9.0.257.17",
+      "port-version": 0
+    },
    {
      "git-tree": "06594ed228d75261805f473207a1db1757f974fe",
      "version-string": "8.6.395.17",